diff --git a/Source/Game/Maps/Map.cs b/Source/Game/Maps/Map.cs
index 7b7e0cd02..7f6f2b303 100644
--- a/Source/Game/Maps/Map.cs
+++ b/Source/Game/Maps/Map.cs
@@ -2085,7 +2085,6 @@ namespace Game.Maps
             {
                 data.AreaId = areaEntry.Id;
                 data.FloorZ = vmapData.floorZ;
-                data.outdoors = IsOutdoorWMO(vmapData.areaInfo.Value.MogpFlags, wmoEntry, areaEntry);
             }
             else
             {
@@ -2101,9 +2100,13 @@ namespace Game.Maps
                     areaEntry = CliDB.AreaTableStorage.LookupByKey(data.AreaId);
 
                 data.FloorZ = mapHeight;
-                data.outdoors = true; // @todo default true taken from old GetAreaId check, maybe review
             }
 
+            if (vmapData.areaInfo.HasValue)
+                data.outdoors = IsOutdoorWMO(vmapData.areaInfo.Value.MogpFlags, wmoEntry, areaEntry);
+            else
+                data.outdoors = true; // @todo default true taken from old GetAreaId check, maybe review
+
             // liquid processing
             data.LiquidStatus = ZLiquidStatus.NoWater;
             if (vmapData.liquidInfo.HasValue && vmapData.liquidInfo.Value.Level > vmapData.floorZ && z > vmapData.floorZ)