diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 490bf880b..735d40340 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -5111,13 +5111,11 @@ public:
                 pCaster->SendAttackSwingCancelAttack();
             }
 
-            if (!caster->GetInstanceScript() || !caster->GetInstanceScript()->IsEncounterInProgress()) //Don't leave combat if you are in combat with a boss
+            if (instant_exit)
             {
-                if (!instant_exit) {
-                    caster->getHostileRefManager().deleteReferences(); // exit combat after 6 seconds
-                }
-                else caster->CombatStop(); // isn't necessary to call AttackStop because is just called in CombatStop
+                caster->getHostileRefManager().deleteReferences();
             }
+            caster->CombatStop();
         }
 
         void Register() override