diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index 7972f247b46dd..50bb1ede6d479 100644
--- a/services/core/java/com/android/server/locksettings/LockSettingsService.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -1972,7 +1972,13 @@ public class LockSettingsService extends ILockSettings.Stub {
     public VerifyCredentialResponse verifyCredential(LockscreenCredential credential,
             long challenge, int userId) {
         checkPasswordReadPermission(userId);
-        return doVerifyCredential(credential, CHALLENGE_FROM_CALLER, challenge, userId,
+        @ChallengeType int challengeType = CHALLENGE_FROM_CALLER;
+        if (challenge == 0) {
+            Slog.w(TAG, "VerifyCredential called with challenge=0");
+            challengeType = CHALLENGE_NONE;
+
+        }
+        return doVerifyCredential(credential, challengeType, challenge, userId,
                 null /* progressCallback */);
     }