diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp
index 2592843a3b4..d57c6abcb99 100644
--- a/src/server/game/Combat/ThreatManager.cpp
+++ b/src/server/game/Combat/ThreatManager.cpp
@@ -173,6 +173,8 @@ void ThreatManager::Initialize()
 
 void ThreatManager::Update(uint32 tdiff)
 {
+    if (!CanHaveThreatList() || !IsEngaged())
+        return;
     if (_updateClientTimer <= tdiff)
     {
         _updateClientTimer = CLIENT_THREAT_UPDATE_INTERVAL;