diff --git a/src/main/java/net/moonleay/gimbal/client/editor/ClientEditor.kt b/src/main/java/net/moonleay/gimbal/client/editor/ClientEditor.kt
index e64b4e4..b3c1a4f 100644
--- a/src/main/java/net/moonleay/gimbal/client/editor/ClientEditor.kt
+++ b/src/main/java/net/moonleay/gimbal/client/editor/ClientEditor.kt
@@ -70,11 +70,17 @@ object ClientEditor {
             DISABLED_MODIFIERS_STORAGE.clear()
             onUpdated(shouldUpdateServer)
 
-            if (!shouldUpdateServer)
+            if (!shouldUpdateServer) {
+                val player = MinecraftClient.getInstance().player
+                if (player == null) {
+                    println("Player is null!")
+                    return
+                }
                 ServerEditorManager.updateEditorState(
                     MinecraftClient.getInstance().player!!.uuid,
                     this.getClientState()
                 )
+            }
         }
     }