diff --git a/packages/stream_chat_flutter/lib/src/message_widget.dart b/packages/stream_chat_flutter/lib/src/message_widget.dart
index 3a17c1c4..9a75a455 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget.dart
@@ -142,7 +142,7 @@ class MessageWidget extends StatefulWidget {
   /// Function called when quotedMessage is tapped
   final OnQuotedMessageTap onQuotedMessageTap;
 
-  Map<String, VideoPackage> videoPackages = {};
+  final Map<String, VideoPackage> videoPackages;
 
   ///
   MessageWidget({
@@ -192,7 +192,7 @@ class MessageWidget extends StatefulWidget {
     this.attachmentPadding = EdgeInsets.zero,
     this.allRead = false,
     this.onQuotedMessageTap,
-    this.videoPackages,
+    this.videoPackages = const {},
   })  : attachmentBuilders = {
           'image': (context, message, attachment) {
             return ImageAttachment(
diff --git a/packages/stream_chat_flutter/lib/src/video_attachment.dart b/packages/stream_chat_flutter/lib/src/video_attachment.dart
index 97cca98d..107776bf 100644
--- a/packages/stream_chat_flutter/lib/src/video_attachment.dart
+++ b/packages/stream_chat_flutter/lib/src/video_attachment.dart
@@ -1,12 +1,8 @@
-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:chewie/chewie.dart';
 import 'package:flutter/material.dart';
 import 'package:stream_chat_flutter/src/full_screen_media.dart';
-import 'package:stream_chat_flutter/src/utils.dart';
 import 'package:stream_chat_flutter/stream_chat_flutter.dart';
-import 'package:video_player/video_player.dart';
 
-import 'attachment_error.dart';
 import 'attachment_title.dart';
 
 class VideoAttachment extends StatefulWidget {