diff --git a/core/src/main/java/bisq/core/btc/setup/WalletConfig.java b/core/src/main/java/bisq/core/btc/setup/WalletConfig.java
index fc8c6a09506..9f574036429 100644
--- a/core/src/main/java/bisq/core/btc/setup/WalletConfig.java
+++ b/core/src/main/java/bisq/core/btc/setup/WalletConfig.java
@@ -468,9 +468,13 @@ protected void shutDown() throws Exception {
 
             // vPeerGroup.stop has no timeout and can take very long (10 sec. in my test). So we call it at the end.
             // We might get likely interrupted by the parent call timeout.
-            vPeerGroup.stop();
+            if (vPeerGroup.isRunning()) {
+                vPeerGroup.stop();
+                log.info("PeerGroup stopped");
+            } else {
+                log.info("PeerGroup not stopped because it was not running");
+            }
             vPeerGroup = null;
-            log.info("PeerGroup stopped");
         } catch (BlockStoreException e) {
             throw new IOException(e);
         }