diff --git a/packages/stream_chat/lib/src/api/channel.dart b/packages/stream_chat/lib/src/api/channel.dart
index 6fad7868..63fc5595 100644
--- a/packages/stream_chat/lib/src/api/channel.dart
+++ b/packages/stream_chat/lib/src/api/channel.dart
@@ -296,13 +296,13 @@ class Channel {
           it.file!,
           onSendProgress: onSendProgress,
           cancelToken: cancelToken,
-        ).then((it) => it!.file);
+        ).then((it) => it.file);
       } else {
         future = sendFile(
           it.file!,
           onSendProgress: onSendProgress,
           cancelToken: cancelToken,
-        ).then((it) => it!.file);
+        ).then((it) => it.file);
       }
       _cancelableAttachmentUploadRequest[it.id] = cancelToken;
       return future.then((url) {
@@ -886,7 +886,7 @@ class Channel {
     ChannelState response;
 
     try {
-      response = await query(options: watchOptions)!;
+      response = await query(options: watchOptions);
     } catch (error, stackTrace) {
       if (!_initializedCompleter.isCompleted) {
         _initializedCompleter.completeError(error, stackTrace);
@@ -1511,7 +1511,7 @@ class ChannelClientState {
     )
         .listen((event) {
       final message = event.message!;
-      if (isUpToDate! ||
+      if (isUpToDate ||
           (message.parentId != null && message.showInChannel != true)) {
         addMessage(message);
       }
diff --git a/packages/stream_chat/test/src/api/channel_test.dart b/packages/stream_chat/test/src/api/channel_test.dart
index b41214d2..041a3e49 100644
--- a/packages/stream_chat/test/src/api/channel_test.dart
+++ b/packages/stream_chat/test/src/api/channel_test.dart
@@ -1200,8 +1200,8 @@ void main() {
 
           verify(() => mockDio.post<String>('/channels/messaging/query',
               data: options)).called(1);
-          expect(channelClient.id, response?.channel?.id);
-          expect(channelClient.cid, response?.channel?.cid);
+          expect(channelClient.id, response.channel?.id);
+          expect(channelClient.cid, response.channel?.cid);
         });
 
         test('with id', () async {
@@ -1837,8 +1837,8 @@ void main() {
 
         verify(() => mockDio.post<String>('/channels/messaging/query',
             data: options)).called(1);
-        expect(channelClient.id, response?.channel?.id);
-        expect(channelClient.cid, response?.channel?.cid);
+        expect(channelClient.id, response.channel?.id);
+        expect(channelClient.cid, response.channel?.cid);
       });
 
       test('watch', () async {
diff --git a/packages/stream_chat/test/src/models/message_test.dart b/packages/stream_chat/test/src/models/message_test.dart
index ddaed93f..1219e137 100644
--- a/packages/stream_chat/test/src/models/message_test.dart
+++ b/packages/stream_chat/test/src/models/message_test.dart
@@ -102,7 +102,6 @@ void main() {
         id: '4637f7e4-a06b-42db-ba5a-8d8270dd926f',
         text:
             'https://giphy.com/gifs/the-lion-king-live-action-5zvN79uTGfLMOVfQaA',
-        silent: false,
         attachments: [
           Attachment.fromJson(const {
             'type': 'video',
diff --git a/packages/stream_chat/test/src/models/reaction_test.dart b/packages/stream_chat/test/src/models/reaction_test.dart
index 49d226ea..795e2967 100644
--- a/packages/stream_chat/test/src/models/reaction_test.dart
+++ b/packages/stream_chat/test/src/models/reaction_test.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 
-import 'package:test/test.dart';
 import 'package:stream_chat/src/models/reaction.dart';
 import 'package:stream_chat/src/models/user.dart';
+import 'package:test/test.dart';
 
 void main() {
   group('src/models/reaction', () {
@@ -33,7 +33,7 @@ void main() {
       expect(reaction.createdAt, DateTime.parse('2020-01-28T22:17:31.108742Z'));
       expect(reaction.type, 'wow');
       expect(
-        reaction.user.toJson(),
+        reaction.user?.toJson(),
         User(id: '2de0297c-f3f2-489d-b930-ef77342edccf', extraData: {
           'image': 'https://randomuser.me/api/portraits/women/45.jpg',
           'name': 'Daisy Morgan'