diff --git a/src/mobx/State.ts b/src/mobx/State.ts
index 8f1c5720..9c004da6 100644
--- a/src/mobx/State.ts
+++ b/src/mobx/State.ts
@@ -66,6 +66,8 @@ export default class State {
         makeAutoObservable(this);
         this.register();
         this.setDisabled = this.setDisabled.bind(this);
+
+        this.client = undefined;
     }
 
     /**
@@ -202,7 +204,17 @@ export default class State {
         });
 
         return () => {
-            delete this.client;
+            // ! FIXME: quick fix
+            try {
+                try {
+                    this.client = undefined;
+                } catch (err) {
+                    reportError(err as any, "state_L207");
+                }
+            } catch (err) {
+                /** just for good measure */
+            }
+
             listeners.forEach((x) => x());
         };
     }