diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 349dff4f2e..15dabad7f5 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2899,10 +2899,9 @@ bool CWallet::NewKeyPool()
             walletdb.ErasePool(nIndex);
         setKeyPool.clear();
 
-        if (IsLocked())
+        if (!TopUpKeyPool()) {
             return false;
-
-        TopUpKeyPool();
+        }
         LogPrintf("CWallet::NewKeyPool rewrote keypool\n");
     }
     return true;