diff --git a/OpenKeychain/src/main/sqldelight/org/sufficientlysecure/keychain/KeyMetadata.sq b/OpenKeychain/src/main/sqldelight/org/sufficientlysecure/keychain/KeyMetadata.sq
index 0f41a6c2a..d219f0016 100644
--- a/OpenKeychain/src/main/sqldelight/org/sufficientlysecure/keychain/KeyMetadata.sq
+++ b/OpenKeychain/src/main/sqldelight/org/sufficientlysecure/keychain/KeyMetadata.sq
@@ -23,6 +23,6 @@ REPLACE INTO key_metadata
 
 selectFingerprintsForKeysOlderThan:
 SELECT fingerprint
-    FROM key_metadata
-        LEFT JOIN keys ON (key_metadata.master_key_id = keys.master_key_id AND keys.rank = 0)
-    WHERE last_updated < ?;
\ No newline at end of file
+    FROM keys
+        LEFT JOIN key_metadata USING (master_key_id)
+    WHERE rank = 0 AND (last_updated IS NULL OR last_updated < ?);
\ No newline at end of file