diff --git a/src/main/java/org/embeddedt/modernfix/ModernFixClient.java b/src/main/java/org/embeddedt/modernfix/ModernFixClient.java
index 712e7759..148ac4d7 100644
--- a/src/main/java/org/embeddedt/modernfix/ModernFixClient.java
+++ b/src/main/java/org/embeddedt/modernfix/ModernFixClient.java
@@ -3,16 +3,20 @@ package org.embeddedt.modernfix;
 import com.mojang.datafixers.util.Pair;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.components.DebugScreenOverlay;
 import net.minecraft.client.gui.screens.ConnectScreen;
 import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.world.entity.Entity;
+import net.minecraftforge.client.event.ClientPlayerNetworkEvent;
 import net.minecraftforge.client.event.GuiOpenEvent;
 import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
+import net.minecraftforge.client.gui.ForgeIngameGui;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.TickEvent;
+import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.ModContainer;
@@ -86,6 +90,16 @@ public class ModernFixClient {
         }
     }
 
+    @SubscribeEvent
+    public void onDisconnect(WorldEvent.Unload event) {
+        if(event.getWorld().isClientSide()) {
+            DebugScreenOverlay overlay = ObfuscationReflectionHelper.getPrivateValue(ForgeIngameGui.class, (ForgeIngameGui)Minecraft.getInstance().gui, "debugOverlay");
+            if(overlay != null) {
+                Minecraft.getInstance().tell(overlay::clearChunkCache);
+            }
+        }
+    }
+
     /**
      * Check if the IDs match and remap them if not.
      * @return true if ID remap was needed