diff --git a/EOLib.IO/Map/IMapFile.cs b/EOLib.IO/Map/IMapFile.cs
index 8c899fb52..1cdb63d7f 100644
--- a/EOLib.IO/Map/IMapFile.cs
+++ b/EOLib.IO/Map/IMapFile.cs
@@ -9,6 +9,7 @@ public interface IMapFile
         IReadOnlyMatrix<TileSpec> Tiles { get; }
         IReadOnlyMatrix<WarpMapEntity> Warps { get; }
         IReadOnlyDictionary<MapLayer, IReadOnlyMatrix<int>> GFX { get; }
+        IReadOnlyDictionary<MapLayer, IReadOnlyList<int>> EmptyGFXRows { get; }
         IReadOnlyList<NPCSpawnMapEntity> NPCSpawns { get; }
         IReadOnlyList<UnknownMapEntity> Unknowns { get; }
         IReadOnlyList<ChestSpawnMapEntity> Chests { get; }
@@ -22,7 +23,7 @@ public interface IMapFile
 
         IMapFile WithWarps(Matrix<WarpMapEntity> warps);
 
-        IMapFile WithGFX(Dictionary<MapLayer, Matrix<int>> gfx);
+        IMapFile WithGFX(Dictionary<MapLayer, Matrix<int>> gfx, Dictionary<MapLayer, List<int>> emptyLayers);
 
         IMapFile WithNPCSpawns(List<NPCSpawnMapEntity> npcSpawns);
 
diff --git a/EOLib.IO/Map/MapFile.cs b/EOLib.IO/Map/MapFile.cs
index 49cc19d90..98b56678c 100644
--- a/EOLib.IO/Map/MapFile.cs
+++ b/EOLib.IO/Map/MapFile.cs
@@ -13,6 +13,7 @@ public class MapFile : IMapFile
         public IReadOnlyMatrix<TileSpec> Tiles => _mutableTiles;
         public IReadOnlyMatrix<WarpMapEntity> Warps => _mutableWarps;
         public IReadOnlyDictionary<MapLayer, IReadOnlyMatrix<int>> GFX => _readOnlyGFX;
+        public IReadOnlyDictionary<MapLayer, IReadOnlyList<int>> EmptyGFXRows => _readOnlyEmptyGFXRows;
         public IReadOnlyList<NPCSpawnMapEntity> NPCSpawns => _mutableNPCSpawns;
         public IReadOnlyList<UnknownMapEntity> Unknowns => _mutableUnknowns;
         public IReadOnlyList<ChestSpawnMapEntity> Chests => _mutableChestSpawns;
@@ -22,6 +23,8 @@ public class MapFile : IMapFile
         private Matrix<WarpMapEntity> _mutableWarps;
         private Dictionary<MapLayer, Matrix<int>> _mutableGFX;
         private IReadOnlyDictionary<MapLayer, IReadOnlyMatrix<int>> _readOnlyGFX;
+        private Dictionary<MapLayer, List<int>> _mutableEmptyGFXRows;
+        private IReadOnlyDictionary<MapLayer, IReadOnlyList<int>> _readOnlyEmptyGFXRows;
         private List<NPCSpawnMapEntity> _mutableNPCSpawns;
         private List<UnknownMapEntity> _mutableUnknowns;
         private List<ChestSpawnMapEntity> _mutableChestSpawns;
@@ -32,6 +35,7 @@ public MapFile()
             Matrix<TileSpec>.Empty,
             Matrix<WarpMapEntity>.Empty,
             new Dictionary<MapLayer, Matrix<int>>(),
+            new Dictionary<MapLayer, List<int>>(),
             new List<NPCSpawnMapEntity>(),
             new List<UnknownMapEntity>(),
             new List<ChestSpawnMapEntity>(),
@@ -46,6 +50,7 @@ public MapFile()
             Matrix<TileSpec> tiles,
             Matrix<WarpMapEntity> warps,
             Dictionary<MapLayer, Matrix<int>> gfx,
+            Dictionary<MapLayer, List<int>> emptyGFXRows,
             List<NPCSpawnMapEntity> npcSpawns,
             List<UnknownMapEntity> unknowns,
             List<ChestSpawnMapEntity> chests,
@@ -55,6 +60,7 @@ public MapFile()
             _mutableTiles = tiles;
             _mutableWarps = warps;
             _mutableGFX = gfx;
+            _mutableEmptyGFXRows = emptyGFXRows;
             SetReadOnlyGFX();
             _mutableNPCSpawns = npcSpawns;
             _mutableUnknowns = unknowns;
@@ -89,10 +95,11 @@ public IMapFile WithWarps(Matrix<WarpMapEntity> warps)
             return newMap;
         }
 
-        public IMapFile WithGFX(Dictionary<MapLayer, Matrix<int>> gfx)
+        public IMapFile WithGFX(Dictionary<MapLayer, Matrix<int>> gfx, Dictionary<MapLayer, List<int>> emptyRows)
         {
             var newMap = MakeCopy(this);
             newMap._mutableGFX = gfx;
+            newMap._mutableEmptyGFXRows = emptyRows;
             SetReadOnlyGFX();
             return newMap;
         }
@@ -177,6 +184,7 @@ private static MapFile MakeCopy(MapFile source)
                 source._mutableTiles,
                 source._mutableWarps,
                 source._mutableGFX,
+                source._mutableEmptyGFXRows,
                 source._mutableNPCSpawns,
                 source._mutableUnknowns,
                 source._mutableChestSpawns,
@@ -186,6 +194,7 @@ private static MapFile MakeCopy(MapFile source)
         private void SetReadOnlyGFX()
         {
             _readOnlyGFX = _mutableGFX.ToDictionary(k => k.Key, v => (IReadOnlyMatrix<int>)v.Value);
+            _readOnlyEmptyGFXRows = _mutableEmptyGFXRows.ToDictionary(k => k.Key, v => (IReadOnlyList<int>)v.Value);
         }
     }
 }
diff --git a/EOLib.IO/Services/Serializers/MapFileSerializer.cs b/EOLib.IO/Services/Serializers/MapFileSerializer.cs
index 40afa303d..98bcdd0ac 100644
--- a/EOLib.IO/Services/Serializers/MapFileSerializer.cs
+++ b/EOLib.IO/Services/Serializers/MapFileSerializer.cs
@@ -85,7 +85,7 @@ public IMapFile DeserializeFromByteArray(byte[] data)
                 var mapChests = ReadMapChests(ms);
                 var tileSpecs = ReadTileSpecs(ms, properties);
                 var warpTiles = ReadWarpTiles(ms, properties);
-                var gfxLayers = ReadGFXLayers(ms, properties);
+                var (gfxLayers, emptyLayers) = ReadGFXLayers(ms, properties);
 
                 var mapSigns = new List<SignMapEntity>();
                 if (ms.Position < ms.Length)
@@ -101,7 +101,7 @@ public IMapFile DeserializeFromByteArray(byte[] data)
                     .WithChests(mapChests)
                     .WithTiles(tileSpecs)
                     .WithWarps(warpTiles)
-                    .WithGFX(gfxLayers)
+                    .WithGFX(gfxLayers, emptyLayers)
                     .WithSigns(mapSigns);
             }
         }
@@ -204,9 +204,10 @@ private Matrix<WarpMapEntity> ReadWarpTiles(MemoryStream ms, IMapFileProperties
             return warps;
         }
 
-        private Dictionary<MapLayer, Matrix<int>> ReadGFXLayers(MemoryStream ms, IMapFileProperties properties)
+        private (Dictionary<MapLayer, Matrix<int>>, Dictionary<MapLayer, List<int>>) ReadGFXLayers(MemoryStream ms, IMapFileProperties properties)
         {
             var gfx = new Dictionary<MapLayer, Matrix<int>>();
+            var emptyRows = new Dictionary<MapLayer, List<int>>();
 
             var layers = (MapLayer[])Enum.GetValues(typeof(MapLayer));
             var twoByteBuffer = new byte[2];
@@ -223,6 +224,14 @@ private Matrix<WarpMapEntity> ReadWarpTiles(MemoryStream ms, IMapFileProperties
                     var y = _numberEncoderService.DecodeNumber((byte)ms.ReadByte());
                     var numberOfColsThisLayer = _numberEncoderService.DecodeNumber((byte)ms.ReadByte());
 
+                    if (numberOfColsThisLayer == 0)
+                    {
+                        if (!emptyRows.ContainsKey(layer))
+                            emptyRows.Add(layer, new List<int>());
+
+                        emptyRows[layer].Add(y);
+                    }
+
                     for (int j = 0; j < numberOfColsThisLayer; ++j)
                     {
                         var x = _numberEncoderService.DecodeNumber((byte)ms.ReadByte());
@@ -236,7 +245,7 @@ private Matrix<WarpMapEntity> ReadWarpTiles(MemoryStream ms, IMapFileProperties
                 }
             }
 
-            return gfx;
+            return (gfx, emptyRows);
         }
 
         private List<SignMapEntity> ReadMapSigns(MemoryStream ms)
@@ -365,7 +374,9 @@ private List<byte> WriteGFXLayers(IMapFile mapFile)
                     .Where(rowList => rowList.EntityItems.Any(item => item != DEFAULT_GFX))
                     .ToList();
 
-                ret.AddRange(_numberEncoderService.EncodeNumber(gfxRowsForLayer.Count, 1));
+                var rowsForLayerCount = gfxRowsForLayer.Count + (mapFile.EmptyGFXRows.ContainsKey(layer) ? mapFile.EmptyGFXRows[layer].Count : 0);
+                ret.AddRange(_numberEncoderService.EncodeNumber(rowsForLayerCount, 1));
+
                 foreach (var row in gfxRowsForLayer)
                 {
                     var entityItems = row.EntityItems
@@ -381,6 +392,15 @@ private List<byte> WriteGFXLayers(IMapFile mapFile)
                         ret.AddRange(_numberEncoderService.EncodeNumber(item.Value, 2));
                     }
                 }
+
+                if (mapFile.EmptyGFXRows.ContainsKey(layer))
+                {
+                    foreach (var emptyLayer in mapFile.EmptyGFXRows[layer])
+                    {
+                        ret.AddRange(_numberEncoderService.EncodeNumber(emptyLayer, 1));
+                        ret.AddRange(_numberEncoderService.EncodeNumber(0, 1));
+                    }
+                }
             }
             return ret;
         }
diff --git a/EOLib/Domain/Map/CurrentMapProvider.cs b/EOLib/Domain/Map/CurrentMapProvider.cs
index 3e189b770..9181cc718 100644
--- a/EOLib/Domain/Map/CurrentMapProvider.cs
+++ b/EOLib/Domain/Map/CurrentMapProvider.cs
@@ -17,7 +17,6 @@ public class CurrentMapProvider : ICurrentMapProvider
             _mapFileProvider = mapFileProvider;
         }
 
-
         public IMapFile CurrentMap => _mapFileProvider.MapFiles[_currentMapStateProvider.CurrentMapID];
     }