diff --git a/src/server/game/AI/CoreAI/PassiveAI.cpp b/src/server/game/AI/CoreAI/PassiveAI.cpp
index 1ff7b66a34..79ac51fa81 100644
--- a/src/server/game/AI/CoreAI/PassiveAI.cpp
+++ b/src/server/game/AI/CoreAI/PassiveAI.cpp
@@ -23,6 +23,7 @@ PossessedAI::PossessedAI(Creature* c) : CreatureAI(c) { me->SetReactState(REACT_
 NullCreatureAI::NullCreatureAI(Creature* c) : CreatureAI(c)
 {
     me->SetReactState(REACT_PASSIVE);
+    // TODO: Remove once WorldObject casting is ported (triggers won't create combat refs from spell casts)
     me->SetIsCombatDisallowed(true);
 }
 
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index 3e7ebb34e5..3ddb27669d 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -314,7 +314,11 @@ public:
 
 struct npc_training_dummy : NullCreatureAI
 {
-    npc_training_dummy(Creature* creature) : NullCreatureAI(creature) { }
+    npc_training_dummy(Creature* creature) : NullCreatureAI(creature)
+    {
+        // TODO: Remove once WorldObject casting is ported
+        me->SetIsCombatDisallowed(false);
+    }
 
     void JustEnteredCombat(Unit* who) override
     {
@@ -359,6 +363,8 @@ struct npc_target_dummy : NullCreatureAI
 {
     npc_target_dummy(Creature* creature) : NullCreatureAI(creature)
     {
+        // TODO: Remove once WorldObject casting is ported
+        me->SetIsCombatDisallowed(false);
         _deathTimer = 15s;
     }