diff --git a/firebase-firestore/CHANGELOG.md b/firebase-firestore/CHANGELOG.md
index 4e91bb7da08..139a04f5d88 100644
--- a/firebase-firestore/CHANGELOG.md
+++ b/firebase-firestore/CHANGELOG.md
@@ -3,6 +3,7 @@
   (#5871).
 
 - [fixed] Fixed Firestore failing to raise initial snapshot from empty local cache result.
+- [fixed] Removed invalid suggestions to use `GenericTypeIndicator` from error messages.
 
 # 24.4.0
 * [feature] Added
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/util/CustomClassMapper.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/util/CustomClassMapper.java
index 542b402c4fd..4fdbee103f0 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/util/CustomClassMapper.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/util/CustomClassMapper.java
@@ -246,10 +246,7 @@ private static <T> T deserializeToClass(Object o, Class<T> clazz, DeserializeCon
           context.errorPath, "Converting to Arrays is not supported, please use Lists instead");
     } else if (clazz.getTypeParameters().length > 0) {
       throw deserializeError(
-          context.errorPath,
-          "Class "
-              + clazz.getName()
-              + " has generic type parameters, please use GenericTypeIndicator instead");
+          context.errorPath, "Class " + clazz.getName() + " has generic type parameters");
     } else if (clazz.equals(Object.class)) {
       return (T) o;
     } else if (clazz.isEnum()) {
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/util/MapperTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/util/MapperTest.java
index 6fffd89f3ec..c0ea8bfd405 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/util/MapperTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/util/MapperTest.java
@@ -1883,16 +1883,14 @@ public void primitiveClassesCanBePassedInTopLevel() {
   @Test
   public void passingInListTopLevelThrows() {
     assertExceptionContains(
-        "Class java.util.List has generic type parameters, please use GenericTypeIndicator "
-            + "instead",
+        "Class java.util.List has generic type parameters",
         () -> convertToCustomClass(Collections.singletonList("foo"), List.class));
   }
 
   @Test
   public void passingInMapTopLevelThrows() {
     assertExceptionContains(
-        "Class java.util.Map has generic type parameters, please use GenericTypeIndicator "
-            + "instead",
+        "Class java.util.Map has generic type parameters",
         () -> convertToCustomClass(Collections.singletonMap("foo", "bar"), Map.class));
   }
 
@@ -1920,7 +1918,7 @@ public void passingInByteTopLevelThrows() {
   public void passingInGenericBeanTopLevelThrows() {
     assertExceptionContains(
         "Class com.google.firebase.firestore.util.MapperTest$GenericBean has generic type "
-            + "parameters, please use GenericTypeIndicator instead",
+            + "parameters",
         () -> deserialize("{'value': 'foo'}", GenericBean.class));
   }