diff --git a/GoogleSignIn/Sources/GIDEMMSupport.h b/GoogleSignIn/Sources/GIDEMMSupport.h
index 61f445a4..7a5de88f 100644
--- a/GoogleSignIn/Sources/GIDEMMSupport.h
+++ b/GoogleSignIn/Sources/GIDEMMSupport.h
@@ -38,6 +38,8 @@ NS_ASSUME_NONNULL_BEGIN
     (NSDictionary *)parameters;
 
 /// Gets a new set of URL parameters that also contains EMM-related URL parameters if needed.
+///
+/// @note This function only returns parameter keys in the `NSDictionary` for string/number/bools.
 + (NSDictionary<NSString *,NSString *> *)parametersWithParameters:(NSDictionary *)parameters
                                                        emmSupport:(nullable NSString *)emmSupport
                                            isPasscodeInfoRequired:(BOOL)isPasscodeInfoRequired;
diff --git a/GoogleSignIn/Sources/GIDEMMSupport.m b/GoogleSignIn/Sources/GIDEMMSupport.m
index 0914d841..e812c0e3 100644
--- a/GoogleSignIn/Sources/GIDEMMSupport.m
+++ b/GoogleSignIn/Sources/GIDEMMSupport.m
@@ -95,7 +95,7 @@ + (void)handleTokenFetchEMMError:(nullable NSError *)error
                                                        emmSupport:(nullable NSString *)emmSupport
                                            isPasscodeInfoRequired:(BOOL)isPasscodeInfoRequired {
   if (!emmSupport) {
-    return parameters;
+    return [GIDEMMSupport dictionaryWithStringValuesFromDictionary:parameters];
   }
   NSMutableDictionary *allParameters = [(parameters ?: @{}) mutableCopy];
   allParameters[kEMMSupportParameterName] = emmSupport;