diff --git a/packages/cli-repl/src/cli-repl.ts b/packages/cli-repl/src/cli-repl.ts
index 5a142bec7f..c7d37a4e9b 100644
--- a/packages/cli-repl/src/cli-repl.ts
+++ b/packages/cli-repl/src/cli-repl.ts
@@ -336,10 +336,17 @@ class CliRepl {
       replace: '*'
     };
     read(readOptions, (error, password) => {
-      if (error) return console.log(formatError(error));
+      if (error) {
+        this.bus.emit('mongosh:error', error);
+        return console.log(formatError(error));
+      }
 
       driverOptions.auth.password = password;
-      this.connect(driverUri, driverOptions);
+      this.setupRepl(driverUri, driverOptions).catch((e) => {
+        this.bus.emit('mongosh:error', e);
+        console.log(formatError(e));
+        return;
+      });
     });
   }
 }