diff --git a/packages/integration/src/lib/workspace/shared/edition-actions.service.ts b/packages/integration/src/lib/workspace/shared/edition-actions.service.ts
index f1a7f9f131..b0a379655c 100644
--- a/packages/integration/src/lib/workspace/shared/edition-actions.service.ts
+++ b/packages/integration/src/lib/workspace/shared/edition-actions.service.ts
@@ -76,7 +76,7 @@ export class EditionActionsService implements OnDestroy {
     this.zoomAuto$.next(this.zoomAuto);
     this.storageChange$$ = this.storageService.storageChange$
       .pipe(skipWhile((storageChange: StorageServiceEvent) =>
-        storageChange.key !== 'zoomAuto' || storageChange.event === StorageServiceEventEnum.CLEARED))
+        storageChange?.key !== 'zoomAuto' || storageChange?.event === StorageServiceEventEnum.CLEARED))
       .subscribe(() => {
         this.zoomAuto$.next(this.zoomAuto);
         handleZoomAuto(workspace, this.storageService);
diff --git a/packages/integration/src/lib/workspace/shared/wfs-actions.service.ts b/packages/integration/src/lib/workspace/shared/wfs-actions.service.ts
index f42eaff7b6..b3c3ec88fc 100644
--- a/packages/integration/src/lib/workspace/shared/wfs-actions.service.ts
+++ b/packages/integration/src/lib/workspace/shared/wfs-actions.service.ts
@@ -78,7 +78,7 @@ export class WfsActionsService implements OnDestroy {
     this.zoomAuto$.next(this.zoomAuto);
     this.storageChange$$ = this.storageService.storageChange$
       .pipe(skipWhile((storageChange: StorageServiceEvent) =>
-        storageChange.key !== 'zoomAuto' || storageChange.event === StorageServiceEventEnum.CLEARED))
+        storageChange?.key !== 'zoomAuto' || storageChange?.event === StorageServiceEventEnum.CLEARED))
       .subscribe(() => {
         this.zoomAuto$.next(this.zoomAuto);
         handleZoomAuto(workspace, this.storageService);