diff --git a/src/game/ChatCommands/CreatureCommands.cpp b/src/game/ChatCommands/CreatureCommands.cpp
index e1bb7080..3aca2d4c 100644
--- a/src/game/ChatCommands/CreatureCommands.cpp
+++ b/src/game/ChatCommands/CreatureCommands.cpp
@@ -671,6 +671,13 @@ bool ChatHandler::HandleNpcSetModelCommand(char* args)
         return false;
     }
 
+    if (!sCreatureDisplayInfoStore.LookupEntry(displayId))
+    {
+        SendSysMessage(LANG_BAD_VALUE);
+        SetSentErrorMessage(true);
+        return false;
+    }
+
     pCreature->SetDisplayId(displayId);
     pCreature->SetNativeDisplayId(displayId);