diff --git a/lnwallet/wallet.go b/lnwallet/wallet.go
index 005e41df..7bd38b17 100644
--- a/lnwallet/wallet.go
+++ b/lnwallet/wallet.go
@@ -385,7 +385,10 @@ func (l *LightningWallet) Shutdown() error {
 		return nil
 	}
 
+	// Signal the underlying wallet controller to shutdown, waiting until
+	// all active goroutines have been shutdown.
 	l.Stop()
+	l.WaitForShutdown()
 
 	l.rpc.Shutdown()