diff --git a/src/auth/auth-api-request.ts b/src/auth/auth-api-request.ts
index c4ba2ac811..d3c18a2a55 100644
--- a/src/auth/auth-api-request.ts
+++ b/src/auth/auth-api-request.ts
@@ -1152,8 +1152,10 @@ export abstract class AbstractAuthRequestHandler {
   }
 
   public getAccountInfoByFederatedUid(providerId: string, rawId: string): Promise<object> {
-    if (!validator.isNonEmptyString(providerId) || !validator.isNonEmptyString(rawId)) {
+    if (!validator.isNonEmptyString(providerId)) {
       throw new FirebaseAuthError(AuthClientErrorCode.INVALID_PROVIDER_ID);
+    } else if (!validator.isNonEmptyString(rawId)) {
+      throw new FirebaseAuthError(AuthClientErrorCode.INVALID_UID);
     }
 
     const request = {