diff --git a/Map/ChunkMeshBuilderTex2Col4.cs b/Map/ChunkMeshBuilderTex2Col4.cs
index 4f8aee8fd..3e8c8ba74 100644
--- a/Map/ChunkMeshBuilderTex2Col4.cs
+++ b/Map/ChunkMeshBuilderTex2Col4.cs
@@ -20,6 +20,10 @@ namespace ClassicalSharp {
 			arraysCount = newArraysCount;
 		}
 		
+		public void Dispose() {
+			Window.TerrainAtlasChanged -= TerrainAtlasChanged;
+		}
+		
 		class DrawInfo1D {
 			public DrawInfo1DPart Solid = new DrawInfo1DPart();
 			public DrawInfo1DPart Translucent = new DrawInfo1DPart();
diff --git a/Rendering/MapRenderer.cs b/Rendering/MapRenderer.cs
index 0de06614b..097de2826 100644
--- a/Rendering/MapRenderer.cs
+++ b/Rendering/MapRenderer.cs
@@ -52,9 +52,11 @@ namespace ClassicalSharp {
 			ClearChunkCache();
 			chunks = null;
 			unsortedChunks = null;
+			Window.TerrainAtlasChanged -= TerrainAtlasChanged;
 			Window.OnNewMap -= OnNewMap;
 			Window.OnNewMapLoaded -= OnNewMapLoaded;
 			Window.EnvVariableChanged -= EnvVariableChanged;
+			builder.Dispose();
 		}
 		
 		public void Refresh() {