diff --git a/data/sql/updates/pending_db_world/rev_1641658863698434235.sql b/data/sql/updates/pending_db_world/rev_1641658863698434235.sql
new file mode 100644
index 000000000..0b4ab01c6
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1641658863698434235.sql
@@ -0,0 +1,3 @@
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1641658863698434235');
+
+ALTER TABLE `creature` DROP COLUMN `modelid`;
diff --git a/src/server/database/Database/Implementation/WorldDatabase.cpp b/src/server/database/Database/Implementation/WorldDatabase.cpp
index 5871de43c..daa6b08e4 100644
--- a/src/server/database/Database/Implementation/WorldDatabase.cpp
+++ b/src/server/database/Database/Implementation/WorldDatabase.cpp
@@ -83,7 +83,7 @@ void WorldDatabaseConnection::DoPrepareStatements()
     PrepareStatement(WORLD_SEL_CREATURE_BY_ID, "SELECT guid FROM creature WHERE id = ?", CONNECTION_SYNCH);
     PrepareStatement(WORLD_SEL_GAMEOBJECT_NEAREST, "SELECT guid, id, position_x, position_y, position_z, map, (POW(position_x - ?, 2) + POW(position_y - ?, 2) + POW(position_z - ?, 2)) AS order_ FROM gameobject WHERE map = ? AND (POW(position_x - ?, 2) + POW(position_y - ?, 2) + POW(position_z - ?, 2)) <= ? AND (phaseMask & ?) <> 0 ORDER BY order_", CONNECTION_SYNCH);
     PrepareStatement(WORLD_SEL_CREATURE_NEAREST, "SELECT guid, id, position_x, position_y, position_z, map, (POW(position_x - ?, 2) + POW(position_y - ?, 2) + POW(position_z - ?, 2)) AS order_ FROM creature WHERE map = ? AND (POW(position_x - ?, 2) + POW(position_y - ?, 2) + POW(position_z - ?, 2)) <= ? AND (phaseMask & ?) <> 0 ORDER BY order_", CONNECTION_SYNCH);
-    PrepareStatement(WORLD_INS_CREATURE, "INSERT INTO creature (guid, id , map, spawnMask, phaseMask, modelid, equipment_id, position_x, position_y, position_z, orientation, spawntimesecs, wander_distance, currentwaypoint, curhealth, curmana, MovementType, npcflag, unit_flags, dynamicflags) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC);
+    PrepareStatement(WORLD_INS_CREATURE, "INSERT INTO creature (guid, id , map, spawnMask, phaseMask, equipment_id, position_x, position_y, position_z, orientation, spawntimesecs, wander_distance, currentwaypoint, curhealth, curmana, MovementType, npcflag, unit_flags, dynamicflags) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC);
     PrepareStatement(WORLD_DEL_GAME_EVENT_CREATURE, "DELETE FROM game_event_creature WHERE guid = ?", CONNECTION_ASYNC);
     PrepareStatement(WORLD_DEL_GAME_EVENT_MODEL_EQUIP, "DELETE FROM game_event_model_equip WHERE guid = ?", CONNECTION_ASYNC);
     PrepareStatement(WORLD_INS_GAMEOBJECT, "INSERT INTO gameobject (guid, id, map, spawnMask, phaseMask, position_x, position_y, position_z, orientation, rotation0, rotation1, rotation2, rotation3, spawntimesecs, animprogress, state) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC);
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index ea6f41f79..78ec0df93 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -1359,7 +1359,6 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
     stmt->setUInt16(index++, uint16(mapid));
     stmt->setUInt8(index++, spawnMask);
     stmt->setUInt32(index++, GetPhaseMask());
-    stmt->setUInt32(index++, displayId);
     stmt->setInt32(index++, int32(GetCurrentEquipmentId()));
     stmt->setFloat(index++, GetPositionX());
     stmt->setFloat(index++, GetPositionY());
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 2c42991a8..5a61b977d 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -1985,7 +1985,7 @@ void ObjectMgr::LoadCreatures()
     uint32 oldMSTime = getMSTime();
 
     //                                               0              1   2    3        4             5           6           7           8            9              10
-    QueryResult result = WorldDatabase.Query("SELECT creature.guid, id, map, modelid, equipment_id, position_x, position_y, position_z, orientation, spawntimesecs, wander_distance, "
+    QueryResult result = WorldDatabase.Query("SELECT creature.guid, id, map, equipment_id, position_x, position_y, position_z, orientation, spawntimesecs, wander_distance, "
                          //   11               12         13       14            15         16         17          18          19                20                   21
                          "currentwaypoint, curhealth, curmana, MovementType, spawnMask, phaseMask, eventEntry, pool_entry, creature.npcflag, creature.unit_flags, creature.dynamicflags, "
                          //   22
@@ -2028,26 +2028,25 @@ void ObjectMgr::LoadCreatures()
         CreatureData& data      = _creatureDataStore[spawnId];
         data.id                 = entry;
         data.mapid              = fields[2].GetUInt16();
-        data.displayid          = fields[3].GetUInt32();
-        data.equipmentId        = fields[4].GetInt8();
-        data.posX               = fields[5].GetFloat();
-        data.posY               = fields[6].GetFloat();
-        data.posZ               = fields[7].GetFloat();
-        data.orientation        = fields[8].GetFloat();
-        data.spawntimesecs      = fields[9].GetUInt32();
-        data.wander_distance    = fields[10].GetFloat();
-        data.currentwaypoint    = fields[11].GetUInt32();
-        data.curhealth          = fields[12].GetUInt32();
-        data.curmana            = fields[13].GetUInt32();
-        data.movementType       = fields[14].GetUInt8();
-        data.spawnMask          = fields[15].GetUInt8();
-        data.phaseMask          = fields[16].GetUInt32();
-        int16 gameEvent         = fields[17].GetInt8();
-        uint32 PoolId           = fields[18].GetUInt32();
-        data.npcflag            = fields[19].GetUInt32();
-        data.unit_flags         = fields[20].GetUInt32();
-        data.dynamicflags       = fields[21].GetUInt32();
-        data.ScriptId           = GetScriptId(fields[22].GetString());
+        data.equipmentId        = fields[3].GetInt8();
+        data.posX               = fields[4].GetFloat();
+        data.posY               = fields[5].GetFloat();
+        data.posZ               = fields[6].GetFloat();
+        data.orientation        = fields[7].GetFloat();
+        data.spawntimesecs      = fields[8].GetUInt32();
+        data.wander_distance    = fields[9].GetFloat();
+        data.currentwaypoint    = fields[10].GetUInt32();
+        data.curhealth          = fields[11].GetUInt32();
+        data.curmana            = fields[12].GetUInt32();
+        data.movementType       = fields[13].GetUInt8();
+        data.spawnMask          = fields[14].GetUInt8();
+        data.phaseMask          = fields[15].GetUInt32();
+        int16 gameEvent         = fields[16].GetInt8();
+        uint32 PoolId           = fields[17].GetUInt32();
+        data.npcflag            = fields[18].GetUInt32();
+        data.unit_flags         = fields[19].GetUInt32();
+        data.dynamicflags       = fields[20].GetUInt32();
+        data.ScriptId           = GetScriptId(fields[21].GetString());
 
         if (!data.ScriptId)
             data.ScriptId = cInfo->ScriptID;