diff --git a/LDKNodeMonday/App/WalletClient.swift b/LDKNodeMonday/App/WalletClient.swift
index 64f9c4b..769de06 100644
--- a/LDKNodeMonday/App/WalletClient.swift
+++ b/LDKNodeMonday/App/WalletClient.swift
@@ -52,7 +52,7 @@ public class WalletClient {
 
     func start() async {
         var backupInfo: BackupInfo?
-        backupInfo = try? KeyClient.live.getBackupInfo()
+        backupInfo = try? self.keyClient.getBackupInfo()
 
         if backupInfo != nil {
             do {
@@ -61,6 +61,14 @@ public class WalletClient {
                 await MainActor.run {
                     self.network = lightningClient.getNetwork()
                     self.server = lightningClient.getServer()
+                    
+                    // Load LSP from keychain if available
+                    if let savedLSPNodeId = try? self.keyClient.getLSP(),
+                       !savedLSPNodeId.isEmpty,
+                       let savedLSP = LightningServiceProvider.getByNodeId(savedLSPNodeId) {
+                        self.lsp = savedLSP
+                    }
+                    
                     self.appState = .wallet
                 }
             } catch let error {