diff --git a/src/main/java/me/cortex/voxy/client/core/VoxyRenderSystem.java b/src/main/java/me/cortex/voxy/client/core/VoxyRenderSystem.java
index f6a10e08..c1a8b16e 100644
--- a/src/main/java/me/cortex/voxy/client/core/VoxyRenderSystem.java
+++ b/src/main/java/me/cortex/voxy/client/core/VoxyRenderSystem.java
@@ -268,10 +268,10 @@ public class VoxyRenderSystem {
             UploadStream.INSTANCE.tick();
 
             while (this.renderDistanceTracker.setCenterAndProcess(viewport.cameraX, viewport.cameraZ) && VoxyClient.isFrexActive());//While FF is active, run until everything is processed
-            TimingStatistics.I.start();
+            TimingStatistics.H.start();
             //Done here as is allows less gl state resetup
-            this.modelService.tick(900_000);
-            TimingStatistics.I.stop();
+            do { this.modelService.tick(900_000); } while (VoxyClient.isFrexActive() && !this.modelService.areQueuesEmpty());
+            TimingStatistics.H.stop();
         }
         GPUTiming.INSTANCE.marker();
         TimingStatistics.postDynamic.stop();
@@ -307,6 +307,10 @@ public class VoxyRenderSystem {
 
         TimingStatistics.all.stop();
 
+        TimingStatistics.I.start();
+        glFlush();
+        TimingStatistics.I.stop();
+
         /*
         TimingStatistics.F.start();
         this.postProcessing.setup(viewport.width, viewport.height, boundFB);