diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
index 45e0d7420c8..66203f440e9 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
@@ -122,7 +122,10 @@ public:
                         auto list = mgr.GetModifiableThreatList();
                         auto it = list.begin(), end = list.end();
                         if (it == end)
+                        {
                             EnterEvadeMode(EVADE_REASON_NO_HOSTILES);
+                            return;
+                        }
 
                         if ((*it)->GetVictim() != currentVictim)
                             secondThreat = *it;
@@ -142,8 +145,6 @@ public:
                         else
                             pHatefulTarget = (secondThreat->GetVictim()->GetHealth() < thirdThreat->GetVictim()->GetHealth()) ? thirdThreat->GetVictim() : secondThreat->GetVictim();
 
-                        DoCast(pHatefulTarget, SPELL_HATEFUL_STRIKE, true);
-
                         // add threat to highest threat targets
                         AddThreat(currentVictim, HATEFUL_THREAT_AMT);
                         if (secondThreat)
@@ -151,6 +152,8 @@ public:
                         if (thirdThreat)
                             thirdThreat->AddThreat(HATEFUL_THREAT_AMT);
 
+                        DoCast(pHatefulTarget, SPELL_HATEFUL_STRIKE, true);
+
                         events.Repeat(Seconds(1));
                         break;
                     }