diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/ProgressKeeper.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/ProgressKeeper.java
index e5a3b31dbd..41a5b5293d 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/ProgressKeeper.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/ProgressKeeper.java
@@ -90,8 +90,8 @@ public static void waitUntilDone(final Runnable runnable) {
             public void onUpdateTaskCount(int taskCount) {
                 if(taskCount == 0) {
                     runnable.run();
+                    removeTaskCountListener(this);
                 }
-                removeTaskCountListener(this);
             }
         };
         addTaskCountListener(listener);