diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index 5488d8a74b..04ef6b5893 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -105,10 +105,11 @@ static int add_to_keyring(const char *keyname, AskPasswordFlags flags, char **pa
         int r;
 
         assert(keyname);
-        assert(passwords);
 
         if (!(flags & ASK_PASSWORD_PUSH_CACHE))
                 return 0;
+        if (strv_isempty(passwords))
+                return 0;
 
         r = lookup_key(keyname, &serial);
         if (r >= 0) {
@@ -147,7 +148,6 @@ static int add_to_keyring_and_log(const char *keyname, AskPasswordFlags flags, c
         int r;
 
         assert(keyname);
-        assert(passwords);
 
         r = add_to_keyring(keyname, flags, passwords);
         if (r < 0)