diff --git a/src/main/java/eu/crushedpixel/replaymod/events/GuiEventHandler.java b/src/main/java/eu/crushedpixel/replaymod/events/GuiEventHandler.java
index ccc1fd04..da44083f 100755
--- a/src/main/java/eu/crushedpixel/replaymod/events/GuiEventHandler.java
+++ b/src/main/java/eu/crushedpixel/replaymod/events/GuiEventHandler.java
@@ -69,10 +69,14 @@ public class GuiEventHandler {
         }
 
         if(!AuthenticationHandler.isAuthenticated()) return;
+
+        /*
         if(event.gui != null && GuiReplaySaving.replaySaving && !allowedGUIs.contains(event.gui.getClass())) {
             event.gui = new GuiReplaySaving(event.gui);
             return;
         }
+        */
+
         if(event.gui instanceof GuiChat || event.gui instanceof GuiInventory) {
             if(ReplayHandler.isInReplay()) {
                 event.setCanceled(true);
diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiReplaySaving.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiReplaySaving.java
index 83873fea..41bb9d48 100755
--- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiReplaySaving.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiReplaySaving.java
@@ -1,13 +1,10 @@
 package eu.crushedpixel.replaymod.gui;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.resources.I18n;
 
 public class GuiReplaySaving extends GuiScreen {
 
-    public static boolean replaySaving = false;
-
     private GuiScreen waiting = null;
 
     public GuiReplaySaving(GuiScreen waiting) {
@@ -20,9 +17,10 @@ public class GuiReplaySaving extends GuiScreen {
         this.drawCenteredString(this.fontRendererObj, I18n.format("replaymod.gui.replaysaving.title"), this.width / 2, 20, 16777215);
         this.drawCenteredString(this.fontRendererObj, I18n.format("replaymod.gui.replaysaving.message"), this.width / 2, 40, 16777215);
         super.drawScreen(mouseX, mouseY, partialTicks);
-        if(!replaySaving) {
-            Minecraft.getMinecraft().displayGuiScreen(waiting);
-        }
+    }
+
+    public void dispatch() {
+        mc.displayGuiScreen(waiting);
     }
 
 }
diff --git a/src/main/java/eu/crushedpixel/replaymod/recording/DataListener.java b/src/main/java/eu/crushedpixel/replaymod/recording/DataListener.java
index 2ac0b7f4..7e7afcda 100755
--- a/src/main/java/eu/crushedpixel/replaymod/recording/DataListener.java
+++ b/src/main/java/eu/crushedpixel/replaymod/recording/DataListener.java
@@ -3,7 +3,6 @@ package eu.crushedpixel.replaymod.recording;
 import com.google.common.hash.Hashing;
 import com.google.common.io.Files;
 import com.google.gson.Gson;
-import eu.crushedpixel.replaymod.gui.GuiReplaySaving;
 import eu.crushedpixel.replaymod.holders.PacketData;
 import eu.crushedpixel.replaymod.utils.ReplayFile;
 import eu.crushedpixel.replaymod.utils.ReplayFileIO;
@@ -15,8 +14,11 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import java.io.*;
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
@@ -146,8 +148,6 @@ public abstract class DataListener extends ChannelInboundHandlerAdapter {
             active = false;
 
             try {
-                GuiReplaySaving.replaySaving = true;
-
                 String mcversion = Minecraft.getMinecraft().getVersion();
                 String[] split = mcversion.split("-");
                 if(split.length > 0) {
@@ -169,10 +169,8 @@ public abstract class DataListener extends ChannelInboundHandlerAdapter {
                 file.delete();
                 FileUtils.deleteDirectory(tempResourcePacksFolder);
 
-                GuiReplaySaving.replaySaving = false;
             } catch(Exception e) {
                 e.printStackTrace();
-                GuiReplaySaving.replaySaving = false;
             }
         }
 
diff --git a/src/main/java/eu/crushedpixel/replaymod/video/ReplayScreenshot.java b/src/main/java/eu/crushedpixel/replaymod/video/ReplayScreenshot.java
index 1d61c7da..32b6a645 100755
--- a/src/main/java/eu/crushedpixel/replaymod/video/ReplayScreenshot.java
+++ b/src/main/java/eu/crushedpixel/replaymod/video/ReplayScreenshot.java
@@ -3,7 +3,6 @@ package eu.crushedpixel.replaymod.video;
 import eu.crushedpixel.replaymod.ReplayMod;
 import eu.crushedpixel.replaymod.chat.ChatMessageHandler.ChatMessageType;
 import eu.crushedpixel.replaymod.events.TickAndRenderListener;
-import eu.crushedpixel.replaymod.gui.GuiReplaySaving;
 import eu.crushedpixel.replaymod.replay.ReplayHandler;
 import eu.crushedpixel.replaymod.utils.ImageUtils;
 import net.minecraft.client.Minecraft;
@@ -37,8 +36,6 @@ public class ReplayScreenshot {
         locked = true;
 
         try {
-            GuiReplaySaving.replaySaving = true;
-
             mc.gameSettings.hideGUI = true;
             mc.currentScreen = null;
 
@@ -91,7 +88,6 @@ public class ReplayScreenshot {
                     } catch(Exception e) {
                         e.printStackTrace();
                     } finally {
-                        GuiReplaySaving.replaySaving = false;
                         locked = false;
                         TickAndRenderListener.finishScreenshot();
                     }