diff --git a/packages/stream_chat/lib/src/extensions/map_extension.dart b/packages/stream_chat/lib/src/extensions/map_extension.dart
index 8b1cb51f..d99ab96a 100644
--- a/packages/stream_chat/lib/src/extensions/map_extension.dart
+++ b/packages/stream_chat/lib/src/extensions/map_extension.dart
@@ -1,6 +1,6 @@
 /// Useful extension functions for [Map]
-extension MapX on Map {
+extension MapX<K, V> on Map<K, V> {
   /// Returns a new map with null keys or values removed
-  Map<String?, dynamic> get nullProtected => {...this as Map<String?, dynamic>}
-    ..removeWhere((key, value) => key == null || value == null);
+  Map<K, V> get nullProtected =>
+      Map.from(this)..removeWhere((key, value) => key == null || value == null);
 }