diff --git a/common/src/services/state.service.ts b/common/src/services/state.service.ts
index 93200fc5..e29fb448 100644
--- a/common/src/services/state.service.ts
+++ b/common/src/services/state.service.ts
@@ -1151,8 +1151,8 @@ export class StateService implements StateServiceAbstraction {
     }
 
     async getWindow(): Promise<Map<string, any>> {
-        const globals = await this.getGlobals({ storageLocation: StorageLocation.Disk });
-        return Object.keys(globals.window).length > 0 ?
+        const globals = await this.getGlobals(await this.defaultOnDiskOptions());
+        return globals?.window != null && Object.keys(globals.window).length > 0 ?
             globals.window :
             new Map<string, any>();
     }