diff --git a/app/lib/zap/controller.js b/app/lib/zap/controller.js
index 52a15afc..25e12bc7 100644
--- a/app/lib/zap/controller.js
+++ b/app/lib/zap/controller.js
@@ -130,9 +130,12 @@ class ZapController {
   onOnboarding() {
     mainLog.debug('[FSM] onOnboarding...')
 
-    // Deregister IPC listeners so that we can start fresh.
+    // Remove any existing IPC listeners so that we can start fresh.
     this._removeIpcListeners()
 
+    // Register IPC listeners so that we can react to instructions coming from the app.
+    this._registerIpcListeners()
+
     // Ensure wallet is disconnected.
     this.disconnectLightningWallet()
 
@@ -148,9 +151,6 @@ class ZapController {
   onStartOnboarding() {
     mainLog.debug('[FSM] onStartOnboarding...')
 
-    // Register IPC listeners so that we can react to instructions coming from the app.
-    this._registerIpcListeners()
-
     // Notify the app to start the onboarding process.
     this.sendMessage('startOnboarding', this.lndConfig)
   }
@@ -410,7 +410,7 @@ class ZapController {
       process.env.GRPC_SSL_CIPHER_SUITES || grpcSslCipherSuites(options.type)
 
     // If the requested connection type is a local one then start up a new lnd instance.
-    // // Otherwise attempt to connect to an lnd instance using user supplied connection details.
+    // Otherwise attempt to connect to an lnd instance using user supplied connection details.\
     return options.type === 'local' ? this.startLnd() : this.connectLnd()
   }