diff --git a/sql/updates/world/2011_05_16_00_world_creature.sql b/sql/updates/world/2011_05_16_00_world_creature.sql
new file mode 100644
index 0000000000..54e23c9073
--- /dev/null
+++ b/sql/updates/world/2011_05_16_00_world_creature.sql
@@ -0,0 +1 @@
+UPDATE `creature` c LEFT JOIN `creature_template` ct ON c.id=ct.`Entry` SET c.`MovementType`=0,c.`spawndist`=0 WHERE (ct.flags_extra & 128)!=0;
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 9fdb9c24fa..ef6d8c9f56 100755
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -1558,8 +1558,6 @@ void ObjectMgr::LoadCreatures()
                 sLog->outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with `MovementType`=1 (random movement) but with `spawndist`=0, replace by idle movement type (0).", guid, data.id);
                 data.movementType = IDLE_MOTION_TYPE;
             }
-            else if (cInfo->flags_extra & CREATURE_FLAG_EXTRA_TRIGGER)
-                data.movementType = IDLE_MOTION_TYPE;
         }
         else if (data.movementType == IDLE_MOTION_TYPE)
         {