diff --git a/lnd.go b/lnd.go
index 2c62a0e9..073ae81e 100644
--- a/lnd.go
+++ b/lnd.go
@@ -1321,7 +1321,7 @@ func waitForWalletPassword(cfg *Config, restEndpoints []net.Addr,
 					ltndLog.Errorf("Could not unload "+
 						"wallet: %v", err)
 				}
-				return nil, err
+				return nil, shutdown, err
 			}
 		}