diff --git a/electrum/wallet.py b/electrum/wallet.py
index 0830c578e..33b512fe6 100644
--- a/electrum/wallet.py
+++ b/electrum/wallet.py
@@ -3108,7 +3108,7 @@ class Abstract_Wallet(ABC, Logger, EventListener):
 
     def unlock(self, password):
         self.logger.info(f'unlocking wallet')
-        if password:
+        if self.has_password():
             self.check_password(password)
         self._password_in_memory = password