diff --git a/src/main/java/eu/crushedpixel/replaymod/events/GuiEventHandler.java b/src/main/java/eu/crushedpixel/replaymod/events/GuiEventHandler.java
index f8a8bc0d..d7267de3 100755
--- a/src/main/java/eu/crushedpixel/replaymod/events/GuiEventHandler.java
+++ b/src/main/java/eu/crushedpixel/replaymod/events/GuiEventHandler.java
@@ -7,7 +7,6 @@ import eu.crushedpixel.replaymod.gui.GuiReplaySaving;
 import eu.crushedpixel.replaymod.gui.GuiReplaySettings;
 import eu.crushedpixel.replaymod.gui.online.GuiLoginPrompt;
 import eu.crushedpixel.replaymod.gui.online.GuiReplayCenter;
-import eu.crushedpixel.replaymod.gui.online.GuiUploadFile;
 import eu.crushedpixel.replaymod.gui.replaystudio.GuiReplayEditor;
 import eu.crushedpixel.replaymod.gui.replayviewer.GuiReplayViewer;
 import eu.crushedpixel.replaymod.online.authentication.AuthenticationHandler;
@@ -19,7 +18,6 @@ import eu.crushedpixel.replaymod.studio.VersionValidator;
 import eu.crushedpixel.replaymod.timer.MCTimerHandler;
 import eu.crushedpixel.replaymod.utils.MouseUtils;
 import eu.crushedpixel.replaymod.utils.ReplayFileIO;
-import eu.crushedpixel.replaymod.utils.ResourceHelper;
 import eu.crushedpixel.replaymod.video.VideoWriter;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.*;
@@ -59,9 +57,6 @@ public class GuiEventHandler {
             return;
         }
 
-        if(!(event.gui instanceof GuiReplayViewer || event.gui instanceof GuiUploadFile))
-            ResourceHelper.freeAllResources();
-
         if(event.gui instanceof GuiMainMenu) {
             if(ReplayMod.firstMainMenu) {
                 ReplayMod.firstMainMenu = false;
diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiReplayListEntry.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiReplayListEntry.java
index ad065b40..39d4127c 100755
--- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiReplayListEntry.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiReplayListEntry.java
@@ -1,7 +1,7 @@
 package eu.crushedpixel.replaymod.gui.elements;
 
 import eu.crushedpixel.replaymod.api.replay.holders.FileInfo;
-import eu.crushedpixel.replaymod.utils.ResourceHelper;
+import eu.crushedpixel.replaymod.registry.ResourceHelper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiListExtended.IGuiListEntry;
diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiUploadFile.java b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiUploadFile.java
index eb07d0fd..a32efe14 100755
--- a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiUploadFile.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiUploadFile.java
@@ -11,7 +11,7 @@ import eu.crushedpixel.replaymod.recording.ReplayMetaData;
 import eu.crushedpixel.replaymod.reflection.MCPNames;
 import eu.crushedpixel.replaymod.utils.ImageUtils;
 import eu.crushedpixel.replaymod.utils.ReplayFile;
-import eu.crushedpixel.replaymod.utils.ResourceHelper;
+import eu.crushedpixel.replaymod.registry.ResourceHelper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiButton;
@@ -314,7 +314,9 @@ public class GuiUploadFile extends GuiScreen {
 
     @Override
     public void onGuiClosed() {
+        ResourceHelper.freeAllResources();
         Keyboard.enableRepeatEvents(false);
+        super.onGuiClosed();
     }
 
     @Override
diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/replayviewer/GuiReplayViewer.java b/src/main/java/eu/crushedpixel/replaymod/gui/replayviewer/GuiReplayViewer.java
index 2c781208..2b70b8ee 100755
--- a/src/main/java/eu/crushedpixel/replaymod/gui/replayviewer/GuiReplayViewer.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/replayviewer/GuiReplayViewer.java
@@ -9,6 +9,7 @@ import eu.crushedpixel.replaymod.gui.elements.GuiReplayListExtended;
 import eu.crushedpixel.replaymod.gui.online.GuiUploadFile;
 import eu.crushedpixel.replaymod.online.authentication.AuthenticationHandler;
 import eu.crushedpixel.replaymod.recording.ReplayMetaData;
+import eu.crushedpixel.replaymod.registry.ResourceHelper;
 import eu.crushedpixel.replaymod.replay.ReplayHandler;
 import eu.crushedpixel.replaymod.utils.ImageUtils;
 import eu.crushedpixel.replaymod.utils.MouseUtils;
@@ -90,6 +91,12 @@ public class GuiReplayViewer extends GuiScreen implements GuiYesNoCallback {
         }
     }
 
+    @Override
+    public void onGuiClosed() {
+        ResourceHelper.freeAllResources();
+        super.onGuiClosed();
+    }
+
     @Override
     public void initGui() {
         replayGuiList = new ReplayList(this, this.mc, this.width, this.height, 32, this.height - 64, 36);
diff --git a/src/main/java/eu/crushedpixel/replaymod/utils/ResourceHelper.java b/src/main/java/eu/crushedpixel/replaymod/registry/ResourceHelper.java
similarity index 97%
rename from src/main/java/eu/crushedpixel/replaymod/utils/ResourceHelper.java
rename to src/main/java/eu/crushedpixel/replaymod/registry/ResourceHelper.java
index 902a6e5d..b748c1d6 100755
--- a/src/main/java/eu/crushedpixel/replaymod/utils/ResourceHelper.java
+++ b/src/main/java/eu/crushedpixel/replaymod/registry/ResourceHelper.java
@@ -1,4 +1,4 @@
-package eu.crushedpixel.replaymod.utils;
+package eu.crushedpixel.replaymod.registry;
 
 import eu.crushedpixel.replaymod.reflection.MCPNames;
 import net.minecraft.client.Minecraft;