diff --git a/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java b/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
index aba437f76a..aebc87dc9f 100644
--- a/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
+++ b/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
@@ -1808,21 +1808,21 @@ public class XmrWalletService extends XmrWalletBase {
                 //e.printStackTrace();
             }
         } finally {
+            synchronized (pollLock) {
+                pollInProgress = false;
+            }
 
             // cache wallet info last
             synchronized (walletLock) {
                 if (wallet != null && !isShutDownStarted) {
                     try {
                         cacheWalletInfo();
+                        requestSaveMainWallet();
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
                 }
             }
-
-            synchronized (pollLock) {
-                pollInProgress = false;
-            }
         }
     }