diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart
index 91ea4949..e173c703 100644
--- a/packages/stream_chat/lib/src/client/channel.dart
+++ b/packages/stream_chat/lib/src/client/channel.dart
@@ -1888,7 +1888,7 @@ class ChannelClientState {
   void _clean() {
     final now = DateTime.now();
     _typings.forEach((user, event) {
-      if (now.difference(event.createdAt!).inSeconds > 7) {
+      if (now.difference(event.createdAt).inSeconds > 7) {
         _channel.client.handleEvent(
           Event(
             type: EventType.typingStop,
diff --git a/packages/stream_chat_flutter/test/src/full_screen_media_test.dart b/packages/stream_chat_flutter/test/src/full_screen_media_test.dart
index d418c303..3e6f1743 100644
--- a/packages/stream_chat_flutter/test/src/full_screen_media_test.dart
+++ b/packages/stream_chat_flutter/test/src/full_screen_media_test.dart
@@ -55,12 +55,12 @@ void main() {
           ]));
       when(() => channelState.typingEvents).thenAnswer((i) => {
             User(id: 'other-user', extraData: {'name': 'demo'}):
-                const Event(type: EventType.typingStart),
+                Event(type: EventType.typingStart),
           });
       when(() => channelState.typingEventsStream)
           .thenAnswer((i) => Stream.value({
                 User(id: 'other-user', extraData: {'name': 'demo'}):
-                    const Event(type: EventType.typingStart),
+                    Event(type: EventType.typingStart),
               }));
 
       await tester.pumpWidget(MaterialApp(
diff --git a/packages/stream_chat_flutter/test/src/typing_indicator_test.dart b/packages/stream_chat_flutter/test/src/typing_indicator_test.dart
index 75431f44..67c80b1e 100644
--- a/packages/stream_chat_flutter/test/src/typing_indicator_test.dart
+++ b/packages/stream_chat_flutter/test/src/typing_indicator_test.dart
@@ -55,12 +55,12 @@ void main() {
 
       when(() => channelState.typingEvents).thenAnswer((i) => {
             User(id: 'other-user', extraData: {'name': 'demo'}):
-                const Event(type: EventType.typingStart),
+                Event(type: EventType.typingStart),
           });
       when(() => channelState.typingEventsStream)
           .thenAnswer((i) => Stream.value({
                 User(id: 'other-user', extraData: {'name': 'demo'}):
-                    const Event(type: EventType.typingStart),
+                    Event(type: EventType.typingStart),
               }));
 
       await tester.pumpWidget(MaterialApp(