diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index b4abe045d..ed5e47287 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -1275,6 +1275,12 @@ void Map::CreateInstanceData(bool load)
             }
             delete result;
         }
+        else
+        {
+            // for non-instanceable map always add data to table if not found, later code expected that for map in `word` exist always after load
+            if (!Instanceable())
+                CharacterDatabase.PExecute("INSERT INTO world VALUES ('%u', '')", GetId());
+        }
     }
     else
     {
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 8ead35a45..57834728f 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11120"
+ #define REVISION_NR "11121"
 #endif // __REVISION_NR_H__