diff --git a/packages/stream_chat/lib/src/api/channel.dart b/packages/stream_chat/lib/src/api/channel.dart
index ed80ba57..667f28a1 100644
--- a/packages/stream_chat/lib/src/api/channel.dart
+++ b/packages/stream_chat/lib/src/api/channel.dart
@@ -4,7 +4,6 @@ import 'dart:math';
 
 import 'package:dio/dio.dart';
 import 'package:logging/logging.dart';
-import 'package:pedantic/pedantic.dart' show unawaited;
 import 'package:rxdart/rxdart.dart';
 import 'package:stream_chat/src/api/retry_queue.dart';
 import 'package:stream_chat/src/debounce.dart';
@@ -336,10 +335,10 @@ class Channel {
         _messageAttachmentsUploadCompleter[message.id] =
             attachmentsUploadCompleter;
 
-        unawaited(_uploadAttachments(
+        _uploadAttachments(
           message.id,
           message.attachments.map((it) => it.id),
-        ));
+        );
 
         // ignore: parameter_assignments
         message = await attachmentsUploadCompleter.future;
@@ -386,10 +385,10 @@ class Channel {
         _messageAttachmentsUploadCompleter[message.id] =
             attachmentsUploadCompleter;
 
-        unawaited(_uploadAttachments(
+        _uploadAttachments(
           message.id,
           message.attachments.map((it) => it.id),
-        ));
+        );
 
         // ignore: parameter_assignments
         message = await attachmentsUploadCompleter.future;
diff --git a/packages/stream_chat/lib/src/client.dart b/packages/stream_chat/lib/src/client.dart
index d4ae119c..f0823d6b 100644
--- a/packages/stream_chat/lib/src/client.dart
+++ b/packages/stream_chat/lib/src/client.dart
@@ -5,7 +5,6 @@ import 'package:stream_chat/src/extensions/map_extension.dart';
 import 'package:dio/dio.dart';
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
-import 'package:pedantic/pedantic.dart' show unawaited;
 import 'package:rxdart/rxdart.dart';
 import 'package:stream_chat/src/api/channel.dart';
 import 'package:stream_chat/src/api/connection_status.dart';
@@ -510,7 +509,7 @@ class StreamChatClient {
 
       if (status == ConnectionStatus.connected &&
           state.channels?.isNotEmpty == true) {
-        unawaited(queryChannelsOnline(filter: {
+        queryChannelsOnline(filter: {
           'cid': {
             '\$in': state.channels.keys.toList(),
           },
@@ -522,7 +521,7 @@ class StreamChatClient {
               online: true,
             ));
           },
-        ));
+        );
       } else {
         _synced = false;
       }
diff --git a/packages/stream_chat/pubspec.yaml b/packages/stream_chat/pubspec.yaml
index 668f5de3..e8b485c5 100644
--- a/packages/stream_chat/pubspec.yaml
+++ b/packages/stream_chat/pubspec.yaml
@@ -21,8 +21,6 @@ dependencies:
   rxdart: ^0.25.0
   uuid: ^2.2.2
   web_socket_channel: ^1.1.0
-  
-  
 
 dev_dependencies:
   build_runner: ^1.10.0
diff --git a/packages/stream_chat_flutter_core/lib/src/message_list_core.dart b/packages/stream_chat_flutter_core/lib/src/message_list_core.dart
index b162dfca..237754db 100644
--- a/packages/stream_chat_flutter_core/lib/src/message_list_core.dart
+++ b/packages/stream_chat_flutter_core/lib/src/message_list_core.dart
@@ -129,7 +129,7 @@ class _MessageListCoreState extends State<MessageListCore> {
 
     bool defaultFilter(Message m) {
       final isMyMessage = m.user.id == _currentUser.id;
-      final isDeletedOrShadowed = m.isDeleted || m.shadowed;
+      final isDeletedOrShadowed = m.isDeleted == true || m.shadowed == true;
       if (isDeletedOrShadowed && !isMyMessage) return false;
       return true;
     }
diff --git a/packages/stream_chat_flutter_core/pubspec.yaml b/packages/stream_chat_flutter_core/pubspec.yaml
index b289193f..c192f364 100644
--- a/packages/stream_chat_flutter_core/pubspec.yaml
+++ b/packages/stream_chat_flutter_core/pubspec.yaml
@@ -10,7 +10,11 @@ environment:
   flutter: ">=1.17.0"
 
 dependencies:
-  stream_chat: ^1.3.2-beta
+  stream_chat: 
+    git: 
+      url: https://github.com/GetStream/stream-chat-flutter.git
+      ref: develop
+      path: packages/stream_chat
   flutter:
     sdk: flutter
   rxdart: ^0.25.0