diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp
index 5ad256d18bf..3f5d54b4721 100644
--- a/src/server/game/Maps/MapManager.cpp
+++ b/src/server/game/Maps/MapManager.cpp
@@ -186,7 +186,10 @@ Map* MapManager::CreateMap(uint32 mapId, Player* player, uint32 loginInstanceId
             {
                 map = FindMap_i(mapId, loginInstanceId);
                 if (!map && pSave && pSave->GetInstanceId() == loginInstanceId)
+                {
                     map = CreateInstance(mapId, loginInstanceId, pSave, pSave->GetDifficultyID(), player->GetTeamId());
+                    i_maps[{ map->GetId(), map->GetInstanceId() }] = map;
+                }
                 return map;
             }