diff --git a/terminus-ssh/src/services/ssh.service.ts b/terminus-ssh/src/services/ssh.service.ts
index 5c69dc53..9e9fa64b 100644
--- a/terminus-ssh/src/services/ssh.service.ts
+++ b/terminus-ssh/src/services/ssh.service.ts
@@ -91,7 +91,9 @@ export class SSHService {
         await new Promise((resolve, reject) => {
             ssh.on('ready', () => {
                 connected = true
-                this.savePassword(connection, savedPassword)
+                if (savedPassword) {
+                    this.savePassword(connection, savedPassword)
+                }
                 this.zone.run(resolve)
             })
             ssh.on('error', error => {