diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -4454,7 +4454,7 @@
         // The -upgradewallet without argument case
         if (nMaxVersion == 0) {
             LogPrintf("Performing wallet upgrade to %i\n", FEATURE_LATEST);
-            nMaxVersion = CLIENT_VERSION;
+            nMaxVersion = FEATURE_LATEST;
             // permanently upgrade the wallet immediately
             walletInstance->SetMinVersion(FEATURE_LATEST);
         } else {
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -536,7 +536,7 @@
     try {
         int nMinVersion = 0;
         if (m_batch.Read((std::string) "minversion", nMinVersion)) {
-            if (nMinVersion > CLIENT_VERSION) {
+            if (nMinVersion > FEATURE_LATEST) {
                 return DBErrors::TOO_NEW;
             }
             pwallet->LoadMinVersion(nMinVersion);
@@ -654,7 +654,7 @@
     try {
         int nMinVersion = 0;
         if (m_batch.Read((std::string) "minversion", nMinVersion)) {
-            if (nMinVersion > CLIENT_VERSION) {
+            if (nMinVersion > FEATURE_LATEST) {
                 return DBErrors::TOO_NEW;
             }
         }