diff --git a/lnwallet/btcwallet/btcwallet.go b/lnwallet/btcwallet/btcwallet.go
index 71dabd9d..197c6f88 100644
--- a/lnwallet/btcwallet/btcwallet.go
+++ b/lnwallet/btcwallet/btcwallet.go
@@ -94,10 +94,6 @@ func New(cfg *Config) (*BtcWallet, error) {
 		}
 	}
 
-	if err := wallet.Manager.Unlock(cfg.PrivatePass); err != nil {
-		return nil, err
-	}
-
 	// Create a special websockets rpc client for btcd which will be used
 	// by the wallet for notifications, calls, etc.
 	rpcc, err := chain.NewRPCClient(cfg.NetParams, cfg.RPCHost,
@@ -139,6 +135,10 @@ func (b *BtcWallet) Start() error {
 	// current main chain.
 	b.wallet.SynchronizeRPC(b.rpc)
 
+	if err := b.wallet.Unlock(b.cfg.PrivatePass, nil); err != nil {
+		return err
+	}
+
 	return nil
 }