diff --git a/src/main/java/eu/crushedpixel/replaymod/recording/ConnectionEventHandler.java b/src/main/java/eu/crushedpixel/replaymod/recording/ConnectionEventHandler.java
index 9a3ad25e..1785721a 100755
--- a/src/main/java/eu/crushedpixel/replaymod/recording/ConnectionEventHandler.java
+++ b/src/main/java/eu/crushedpixel/replaymod/recording/ConnectionEventHandler.java
@@ -120,9 +120,11 @@ public class ConnectionEventHandler {
 
     @SubscribeEvent
     public void onDisconnectedFromServerEvent(ClientDisconnectionFromServerEvent event) {
-        isRecording = false;
-        MinecraftForge.EVENT_BUS.unregister(guiOverlay);
-        packetListener = null;
-        ReplayMod.chatMessageHandler.stop();
+        if (isRecording) {
+            isRecording = false;
+            MinecraftForge.EVENT_BUS.unregister(guiOverlay);
+            packetListener = null;
+            ReplayMod.chatMessageHandler.stop();
+        }
     }
 }