diff --git a/app/assets/javascripts/services/autolock_service.ts b/app/assets/javascripts/services/autolock_service.ts
index fc1692ad0..544296bdd 100644
--- a/app/assets/javascripts/services/autolock_service.ts
+++ b/app/assets/javascripts/services/autolock_service.ts
@@ -15,7 +15,7 @@ const STORAGE_KEY_AUTOLOCK_INTERVAL = "AutoLockIntervalKey";
 
 export class AutolockService extends ApplicationService {
 
-  private unsubState: any
+  private unsubState?: () => void;
   private pollFocusInterval: any
   private lastFocusState?: 'hidden' | 'visible'
   private lockAfterDate?: Date
@@ -42,7 +42,7 @@ export class AutolockService extends ApplicationService {
   }
 
   deinit() {
-    this.unsubState();
+    this.unsubState?.();
     this.cancelAutoLockTimer();
     if (this.pollFocusInterval) {
       clearInterval(this.pollFocusInterval);
diff --git a/app/assets/javascripts/views/editor/editor_view.ts b/app/assets/javascripts/views/editor/editor_view.ts
index 131562893..7ad055864 100644
--- a/app/assets/javascripts/views/editor/editor_view.ts
+++ b/app/assets/javascripts/views/editor/editor_view.ts
@@ -923,8 +923,8 @@ class EditorViewCtrl extends PureViewCtrl<{}, EditorState> {
 
     if (
       this.state.marginResizersEnabled &&
-      this.leftPanelPuppet!.ready &&
-      this.rightPanelPuppet!.ready
+      this.leftPanelPuppet?.ready &&
+      this.rightPanelPuppet?.ready
     ) {
       const width = this.application.getPrefsService().getValue(
         WebPrefKey.EditorWidth,