diff --git a/libs/common/src/platform/state/implementations/default-single-user-state.ts b/libs/common/src/platform/state/implementations/default-single-user-state.ts
index fc25e0afbc5..b03351bc044 100644
--- a/libs/common/src/platform/state/implementations/default-single-user-state.ts
+++ b/libs/common/src/platform/state/implementations/default-single-user-state.ts
@@ -28,7 +28,9 @@ export class DefaultSingleUserState<T>
   }
 
   protected override async doStorageSave(newState: T, oldState: T): Promise<void> {
-    await super.doStorageSave(newState, oldState);
+    if (newState != null) {
+      await super.doStorageSave(newState, oldState);
+    }
     if (newState != null && oldState == null) {
       await this.stateEventRegistrarService.registerEvents(this.keyDefinition);
     }