diff --git a/core/src/main/java/com/google/bitcoin/kits/WalletAppKit.java b/core/src/main/java/com/google/bitcoin/kits/WalletAppKit.java
index f9c87aff6..e877af24e 100644
--- a/core/src/main/java/com/google/bitcoin/kits/WalletAppKit.java
+++ b/core/src/main/java/com/google/bitcoin/kits/WalletAppKit.java
@@ -226,8 +226,11 @@ public class WalletAppKit extends AbstractIdleService {
                 vWallet = new Wallet(params);
                 vWallet.addKey(new ECKey());
                 addWalletExtensions();
+                vWallet.saveToFile(vWalletFile);
+            }
+            if (useAutoSave) {
+                vWallet.autosaveToFile(vWalletFile, 200, TimeUnit.MILLISECONDS, null);
             }
-            if (useAutoSave) vWallet.autosaveToFile(vWalletFile, 1, TimeUnit.SECONDS, null);
             // Set up peer addresses or discovery first, so if wallet extensions try to broadcast a transaction
             // before we're actually connected the broadcast waits for an appropriate number of connections.
             if (peerAddresses != null) {