diff --git a/src/server/game/Combat/ThreatMgr.cpp b/src/server/game/Combat/ThreatMgr.cpp
index c1041da4967d0e..21b3741d8c3867 100644
--- a/src/server/game/Combat/ThreatMgr.cpp
+++ b/src/server/game/Combat/ThreatMgr.cpp
@@ -654,8 +654,12 @@ void ThreatMgr::ResetAllThreat()
     if (threatList.empty())
         return;
 
-    for (ThreatContainer::StorageType::iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
-        (*itr)->SetThreat(0);
+    for (HostileReference* ref : threatList)
+    {
+        // Reset temp threat before setting threat back to 0.
+        ref->resetTempThreat();
+        ref->SetThreat(0.f);
+    }
 
     setDirty(true);
 }