diff --git a/src/js/components/logon.js b/src/js/components/logon.js
index 9ce3e24ca..a8a3ecdb0 100644
--- a/src/js/components/logon.js
+++ b/src/js/components/logon.js
@@ -350,7 +350,9 @@ function LogonViewModel() {
         if (lastAddressWithMovement) {
           generateAnotherAddress = true;
         } else if ((totalAddresses - PREFERENCES['num_addresses_used']) >= PREFERENCES['num_segwit_addresses_used'] && !lastAddressWithMovement) {
-          WALLET.addresses.pop();
+          if (WALLET.addresses.length > 1) {
+            WALLET.addresses.pop();
+          }
           generateAnotherAddress = false;
         }