diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2247f45e..77b7def1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Fixed
+
+-   Remember passphrase option did not work with keys that had empty passphrases and were generated before 2019
+
 ### Added
 
 -   Add GNU IceCatMobile to the list of supported browsers for Autofill
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt
index 6df5f65d..8cf09b39 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt
@@ -67,7 +67,7 @@ private class GitOperationCredentialFinder(val callingActivity: Activity, val co
         val storedCredential = gitOperationPrefs.getString(credentialPref, null)
         if (isRetry)
             gitOperationPrefs.edit { remove(credentialPref) }
-        if (storedCredential.isNullOrEmpty()) {
+        if (storedCredential == null) {
             val layoutInflater = LayoutInflater.from(callingActivity)
 
             @SuppressLint("InflateParams")