diff --git a/src/DotTiled.Tests/TestData/Maps/map-with-infinite-and-empty-chunks/map-with-infinite-and-empty-chunks.cs b/src/DotTiled.Tests/TestData/Maps/map-with-infinite-and-empty-chunks/map-with-infinite-and-empty-chunks.cs
new file mode 100644
index 0000000..b4d5809
--- /dev/null
+++ b/src/DotTiled.Tests/TestData/Maps/map-with-infinite-and-empty-chunks/map-with-infinite-and-empty-chunks.cs
@@ -0,0 +1,38 @@
+namespace DotTiled.Tests;
+
+public partial class TestData
+{
+  public static Map MapWithInfiniteAndEmptyChunks() => new Map
+  {
+    Class = "",
+    Orientation = MapOrientation.Orthogonal,
+    Width = 5,
+    Height = 5,
+    TileWidth = 32,
+    TileHeight = 32,
+    Infinite = true,
+    ParallaxOriginX = 0,
+    ParallaxOriginY = 0,
+    RenderOrder = RenderOrder.RightDown,
+    CompressionLevel = -1,
+    BackgroundColor = new TiledColor { R = 0, G = 0, B = 0, A = 0 },
+    Version = "1.10",
+    TiledVersion = "1.11.0",
+    NextLayerID = 2,
+    NextObjectID = 1,
+    Layers = [
+      new TileLayer
+      {
+        ID = 1,
+        Name = "Tile Layer 1",
+        Width = 5,
+        Height = 5,
+        Data = new Data
+        {
+          Encoding = DataEncoding.Csv,
+          Chunks = new Optional<Chunk[]>(Array.Empty<Chunk>())
+        }
+      }
+    ]
+  };
+}
diff --git a/src/DotTiled.Tests/TestData/Maps/map-with-infinite-and-empty-chunks/map-with-infinite-and-empty-chunks.tmj b/src/DotTiled.Tests/TestData/Maps/map-with-infinite-and-empty-chunks/map-with-infinite-and-empty-chunks.tmj
new file mode 100644
index 0000000..05d1f9b
--- /dev/null
+++ b/src/DotTiled.Tests/TestData/Maps/map-with-infinite-and-empty-chunks/map-with-infinite-and-empty-chunks.tmj
@@ -0,0 +1,28 @@
+{ "compressionlevel":-1,
+ "height":5,
+ "infinite":true,
+ "layers":[
+        {
+         "chunks":[],
+         "height":5,
+         "id":1,
+         "name":"Tile Layer 1",
+         "opacity":1,
+         "type":"tilelayer",
+         "visible":true,
+         "width":5,
+         "x":0,
+         "y":0
+        }],
+ "nextlayerid":2,
+ "nextobjectid":1,
+ "orientation":"orthogonal",
+ "renderorder":"right-down",
+ "tiledversion":"1.11.0",
+ "tileheight":32,
+ "tilesets":[],
+ "tilewidth":32,
+ "type":"map",
+ "version":"1.10",
+ "width":5
+}
\ No newline at end of file
diff --git a/src/DotTiled.Tests/TestData/Maps/map-with-infinite-and-empty-chunks/map-with-infinite-and-empty-chunks.tmx b/src/DotTiled.Tests/TestData/Maps/map-with-infinite-and-empty-chunks/map-with-infinite-and-empty-chunks.tmx
new file mode 100644
index 0000000..be32139
--- /dev/null
+++ b/src/DotTiled.Tests/TestData/Maps/map-with-infinite-and-empty-chunks/map-with-infinite-and-empty-chunks.tmx
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="5" height="5" tilewidth="32" tileheight="32" infinite="1" nextlayerid="2" nextobjectid="1">
+ <layer id="1" name="Tile Layer 1" width="5" height="5">
+  <data encoding="csv"/>
+ </layer>
+</map>
diff --git a/src/DotTiled.Tests/UnitTests/Serialization/TestData.cs b/src/DotTiled.Tests/UnitTests/Serialization/TestData.cs
index 2256f83..c07897a 100644
--- a/src/DotTiled.Tests/UnitTests/Serialization/TestData.cs
+++ b/src/DotTiled.Tests/UnitTests/Serialization/TestData.cs
@@ -51,6 +51,7 @@ public static partial class TestData
     [GetMapPath("map-with-deep-props"), (string f) => MapWithDeepProps(), MapWithDeepPropsCustomTypeDefinitions()],
     [GetMapPath("map-with-class"), (string f) => MapWithClass(), MapWithClassCustomTypeDefinitions()],
     [GetMapPath("map-with-class-and-props"), (string f) => MapWithClassAndProps(), MapWithClassAndPropsCustomTypeDefinitions()],
+    [GetMapPath("map-with-infinite-and-empty-chunks"), (string f) => MapWithInfiniteAndEmptyChunks(), Array.Empty<ICustomTypeDefinition>()],
     [GetMapPath("map-override-object-bug"), (string f) => MapOverrideObjectBug(f), MapOverrideObjectBugCustomTypeDefinitions()],
   ];
 }