diff --git a/fabric/src/main/java/com/noxcrew/noxesium/NoxesiumMod.java b/fabric/src/main/java/com/noxcrew/noxesium/NoxesiumMod.java
index c151a60..9939afe 100644
--- a/fabric/src/main/java/com/noxcrew/noxesium/NoxesiumMod.java
+++ b/fabric/src/main/java/com/noxcrew/noxesium/NoxesiumMod.java
@@ -2,6 +2,7 @@
 
 import com.google.common.base.Preconditions;
 import com.mojang.blaze3d.shaders.CompiledShader;
+import com.mojang.blaze3d.systems.RenderSystem;
 import com.noxcrew.noxesium.api.protocol.ClientSettings;
 import com.noxcrew.noxesium.api.protocol.ProtocolVersion;
 import com.noxcrew.noxesium.config.NoxesiumConfig;
@@ -190,7 +191,7 @@ public void onInitializeClient() {
 
         // Clear out all UI rendering state when we start configuring
         ClientConfigurationConnectionEvents.START.register((ignored1, ignored2) -> {
-            NoxesiumMod.forEachRenderStateHolder(NoxesiumRenderStateHolder::clear);
+            RenderSystem.recordRenderCall(() -> NoxesiumMod.forEachRenderStateHolder(NoxesiumRenderStateHolder::clear));
         });
 
         // Call disconnection hooks