diff --git a/src/main/java/mchorse/blockbuster/client/KeyboardHandler.java b/src/main/java/mchorse/blockbuster/client/KeyboardHandler.java
index 647f2a77a..ad4e1ec1c 100644
--- a/src/main/java/mchorse/blockbuster/client/KeyboardHandler.java
+++ b/src/main/java/mchorse/blockbuster/client/KeyboardHandler.java
@@ -53,6 +53,7 @@ public void onUserLogOut(ClientDisconnectionFromServerEvent event)
     {
         ClientProxy.manager.reset();
         ClientProxy.recordingOverlay.setVisible(false);
+        RenderingHandler.resetEmitters();
 
         Minecraft.getMinecraft().addScheduledTask(StructureMorph::cleanUp);
     }
diff --git a/src/main/java/mchorse/blockbuster/client/RenderingHandler.java b/src/main/java/mchorse/blockbuster/client/RenderingHandler.java
index 985218ea4..7707718d3 100644
--- a/src/main/java/mchorse/blockbuster/client/RenderingHandler.java
+++ b/src/main/java/mchorse/blockbuster/client/RenderingHandler.java
@@ -211,6 +211,11 @@ public static void updateEmitters()
         }
     }
 
+    public static void resetEmitters()
+    {
+        emitters.clear();
+    }
+
     /**
      * Called by ASM
      */