diff --git a/Source/Game/Maps/MapManager.cs b/Source/Game/Maps/MapManager.cs
index 2e9e4715d..d47680e96 100644
--- a/Source/Game/Maps/MapManager.cs
+++ b/Source/Game/Maps/MapManager.cs
@@ -181,7 +181,10 @@ namespace Game.Entities
                         {
                             map = FindMap_i(mapId, loginInstanceId);
                             if (map == null && pSave != null && pSave.GetInstanceId() == loginInstanceId)
+                            {
                                 map = CreateInstance(mapId, loginInstanceId, pSave, pSave.GetDifficultyID(), player.GetTeamId());
+                                i_maps[(map.GetId(), map.GetInstanceId())] = map;
+                            }
                             return map;
                         }