diff --git a/terminus-ssh/src/components/sshTab.component.ts b/terminus-ssh/src/components/sshTab.component.ts
index e069d3e0..8038ca85 100644
--- a/terminus-ssh/src/components/sshTab.component.ts
+++ b/terminus-ssh/src/components/sshTab.component.ts
@@ -69,7 +69,7 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
         return {
             type: 'app:ssh-tab',
             connection: this.connection,
-            savedState: this.frontend.saveState(),
+            savedState: this.frontend?.saveState(),
         }
     }
 
diff --git a/terminus-terminal/src/components/terminalTab.component.ts b/terminus-terminal/src/components/terminalTab.component.ts
index d33b9b9b..b02bc6c7 100644
--- a/terminus-terminal/src/components/terminalTab.component.ts
+++ b/terminus-terminal/src/components/terminalTab.component.ts
@@ -65,7 +65,7 @@ export class TerminalTabComponent extends BaseTerminalTabComponent {
                 ...this.sessionOptions,
                 cwd: cwd || this.sessionOptions.cwd,
             },
-            savedState: this.frontend.saveState(),
+            savedState: this.frontend?.saveState(),
         }
     }