diff --git a/main.qml b/main.qml
index 228d7bd0..d812ecdd 100644
--- a/main.qml
+++ b/main.qml
@@ -233,9 +233,6 @@ ApplicationWindow {
         if (typeof wizard.m_wallet !== 'undefined') {
             console.log("using wizard wallet")
             //Set restoreHeight
-            if (persistentSettings.restore_height == 0 && persistentSettings.is_recovering_from_device && walletManager.localDaemonSynced()) {
-                persistentSettings.restore_height = walletManager.blockchainHeight() - 1;
-            }
             if(persistentSettings.restore_height > 0){
                 // We store restore height in own variable for performance reasons.
                 restoreHeight = persistentSettings.restore_height
diff --git a/wizard/WizardCreateWalletFromDevice.qml b/wizard/WizardCreateWalletFromDevice.qml
index ae63e2a0..118ef125 100644
--- a/wizard/WizardCreateWalletFromDevice.qml
+++ b/wizard/WizardCreateWalletFromDevice.qml
@@ -96,6 +96,7 @@ ColumnLayout {
         var success = wallet.status === Wallet.Status_Ok;
         if (success) {
             m_wallet = wallet;
+            settingsObject['restore_height'] = m_wallet.walletCreationHeight;
             settingsObject['is_recovering_from_device'] = true;
             settingsObject['tmp_wallet_filename'] = tmp_wallet_filename
         } else {