diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
index 64ca2e899b..d906063ae3 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
@@ -55,6 +55,8 @@ class KonsistClassNameTest {
                 val providedType = it.text
                     .substringBefore(">")
                     .substringAfter("<")
+                    // Get the substring before the first '<' to remove the generic type
+                    .substringBefore("<")
                     .removeSuffix("?")
                     .replace(".", "")
                 it.name.endsWith("Provider") && it.name.contains(providedType)