diff --git a/packages/stream_chat_flutter/lib/src/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view.dart
index 163f3df1..01c067da 100644
--- a/packages/stream_chat_flutter/lib/src/message_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/message_list_view.dart
@@ -238,7 +238,7 @@ class MessageListView extends StatefulWidget {
   /// Customize the MessageWidget textBuilder
   final void Function(BuildContext context, Message message)? textBuilder;
 
-  final void Function(String link) onLinkTap;
+  final void Function(String link)? onLinkTap;
 
   @override
   _MessageListViewState createState() => _MessageListViewState();
diff --git a/packages/stream_chat_persistence/lib/src/dao/channel_query_dao.dart b/packages/stream_chat_persistence/lib/src/dao/channel_query_dao.dart
index 17587cce..9100e76d 100644
--- a/packages/stream_chat_persistence/lib/src/dao/channel_query_dao.dart
+++ b/packages/stream_chat_persistence/lib/src/dao/channel_query_dao.dart
@@ -99,7 +99,7 @@ class ChannelQueryDao extends DatabaseAccessor<MoorChatDatabase>
     if (sort != null && sort.isNotEmpty) {
       chainedComparator = (a, b) {
         int result;
-        for (final comparator in sort!.map((it) => it.comparator)) {
+        for (final comparator in sort.map((it) => it.comparator)) {
           try {
             result = comparator!(a, b);
           } catch (e) {