diff --git a/changelog.txt b/changelog.txt
index f1f1b61c9..54385b20f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,8 @@
 EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
+== 01/25/2015 ==
+Trevius: Fixed an issue where Mercenaries were causing several DB queries per second while suspended.
+
 == 01/24/2015 ==
 Uleat: Added equipment light source functionality to all mob derived classes (may still need tweaking...)
 Notes:
diff --git a/zone/client_process.cpp b/zone/client_process.cpp
index eeeaadcaf..55d9a9f4e 100644
--- a/zone/client_process.cpp
+++ b/zone/client_process.cpp
@@ -233,10 +233,7 @@ bool Client::Process() {
 
 		if(GetMercInfo().MercTemplateID != 0 && GetMercInfo().IsSuspended)
 		{
-			if(p_timers.Expired(&database, pTimerMercSuspend, false))
-			{
-				CheckMercSuspendTimer();
-			}
+			CheckMercSuspendTimer();
 		}
 
 		if(IsAIControlled())
diff --git a/zone/merc.cpp b/zone/merc.cpp
index 5e16cd3d8..963beb9e5 100644
--- a/zone/merc.cpp
+++ b/zone/merc.cpp
@@ -5299,7 +5299,8 @@ void Client::CheckMercSuspendTimer() {
 
 	if(GetMercInfo().SuspendedTime != 0)
 	{
-		if(time(nullptr) >= GetMercInfo().SuspendedTime)
+		//if(time(nullptr) >= GetMercInfo().SuspendedTime)
+		if (p_timers.Expired(&database, pTimerMercSuspend, false))
 		{
 			GetMercInfo().SuspendedTime = 0;
 			SendMercResponsePackets(0);
@@ -5399,11 +5400,9 @@ void Client::SpawnMercOnZone() {
 			}
 			// Send Mercenary Status/Timer packet
 			SendMercTimer(GetMerc());
-			//SendMercPersonalInfo();
-			CheckMercSuspendTimer();
 
 			if (MERC_DEBUG > 0)
-			Message(7, "Mercenary Debug: SpawnMercOnZone Suspended Merc.");
+				Message(7, "Mercenary Debug: SpawnMercOnZone Suspended Merc.");
 		}
 	}
 	else