diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs
index ca904070d..ee1c3eea5 100644
--- a/Source/Game/Entities/Creature/Creature.cs
+++ b/Source/Game/Entities/Creature/Creature.cs
@@ -1145,10 +1145,6 @@ namespace Game.Entities
         
         public override bool IsMovementPreventedByCasting()
         {
-            // Can always move when not casting
-            if (!HasUnitState(UnitState.Casting))
-                return false;
-
             // first check if currently a movement allowed channel is active and we're not casting
             Spell spell = GetCurrentSpell(CurrentSpellTypes.Channeled);
             if (spell != null)
@@ -1161,6 +1157,9 @@ namespace Game.Entities
             if (HasSpellFocus())
                 return true;
 
+            if (!HasUnitState(UnitState.Casting))
+                return true;
+
             return false;
         }