diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 4eefce656a..48ec8abbf1 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -802,10 +802,9 @@ bool Creature::Create(uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry,
         {
             AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING);
         }
+        LastUsedScriptID = GetCreatureInfo()->ScriptID;
     }
 
-    LastUsedScriptID = m_creatureInfo->ScriptID;
-
     return bResult;
 }