diff --git a/changelog.txt b/changelog.txt
index caae41f03..7873e9c15 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -3,6 +3,8 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50)
 == 03/28/2017 ==
 Akkadius: [Performance] Fixed a large overhead issue where every single NPC in a zone was checking to depop themselves
 	as a swarm pet every 3ms regardless of being a swarm pet or not. Swarm pets now check to depop only when their timer is up
+Akkadius: [Performance] Removed Clients constantly calculating light amount on equipment every 600ms, instead clients will update
+	light when changing equipment or entering a zone
 
 == 03/27/2017 ==
 Akkadius: [Performance] Reworked how client to NPC aggro checks are made
diff --git a/zone/client.cpp b/zone/client.cpp
index 97abb3e55..94dd43878 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -153,7 +153,6 @@ Client::Client(EQStreamInterface* ieqs)
 	anon_toggle_timer(250),
 	afk_toggle_timer(250),
 	helm_toggle_timer(250),
-	light_update_timer(600),
 	aggro_meter_timer(AGGRO_METER_UPDATE_MS),
 	m_Proximity(FLT_MAX, FLT_MAX, FLT_MAX), //arbitrary large number
 	m_ZoneSummonLocation(-2.0f,-2.0f,-2.0f),
diff --git a/zone/client.h b/zone/client.h
index 6e6e9e127..43af2a841 100644
--- a/zone/client.h
+++ b/zone/client.h
@@ -1478,7 +1478,6 @@ private:
 	Timer anon_toggle_timer;
 	Timer afk_toggle_timer;
 	Timer helm_toggle_timer;
-	Timer light_update_timer;
 	Timer aggro_meter_timer;
 	Timer npc_close_scan_timer;
 
diff --git a/zone/client_process.cpp b/zone/client_process.cpp
index 1ad41ccf6..c75089b02 100644
--- a/zone/client_process.cpp
+++ b/zone/client_process.cpp
@@ -251,15 +251,6 @@ bool Client::Process() {
 			}
 		}
 
-		if (light_update_timer.Check()) {
-
-			UpdateEquipmentLight();
-			if (UpdateActiveLight()) {
-				SendAppearancePacket(AT_Light, GetActiveLightType());
-			}
-		}
-
-
 		/* Build a close range list of NPC's  */
 		if (npc_close_scan_timer.Check()) {