diff --git a/CHANGELOG.md b/CHANGELOG.md
index e924ddc7..03db8a6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.12
+
+- Upgrade dependencies
+- Check if user.extraData['image'] is not null before using it
+
 ## 0.2.11+1
 
 - Fix error with channel query while handling background notifications
diff --git a/lib/src/message_text.dart b/lib/src/message_text.dart
index ed636a57..a043c53a 100644
--- a/lib/src/message_text.dart
+++ b/lib/src/message_text.dart
@@ -24,7 +24,11 @@ class MessageText extends StatelessWidget {
     final text = _replaceMentions(message.text);
     return MarkdownBody(
       data: text,
-      onTapLink: (text, link, title) {
+      onTapLink: (
+        String link,
+        String href,
+        String title,
+      ) {
         if (link.startsWith('@')) {
           final mentionedUser = message.mentionedUsers.firstWhere(
             (u) => '@${u.name.replaceAll(' ', '')}' == link,
diff --git a/lib/src/user_avatar.dart b/lib/src/user_avatar.dart
index a86206eb..814b21be 100644
--- a/lib/src/user_avatar.dart
+++ b/lib/src/user_avatar.dart
@@ -24,6 +24,9 @@ class UserAvatar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final hasImage = user.extraData?.containsKey('image') == true &&
+        user.extraData['image'] != null &&
+        user.extraData['image'] != '';
     return GestureDetector(
       onTap: onTap != null
           ? () {
@@ -49,7 +52,7 @@ class UserAvatar extends StatelessWidget {
               decoration: BoxDecoration(
                 color: StreamChatTheme.of(context).accentColor,
               ),
-              child: user.extraData?.containsKey('image') ?? false
+              child: hasImage
                   ? CachedNetworkImage(
                       imageUrl: user.extraData['image'],
                       errorWidget: (_, __, ___) {
diff --git a/pubspec.yaml b/pubspec.yaml
index a3cb6d18..241025d0 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: stream_chat_flutter
 homepage: https://github.com/GetStream/stream-chat-flutter
 description: Stream Chat official Flutter SDK. Build your own chat experience using Dart and Flutter.
-version: 0.2.11+1
+version: 0.2.12
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
@@ -21,13 +21,13 @@ dependencies:
   cached_network_image: ^2.2.0+1
   flutter_markdown: ^0.5.0
   url_launcher: ^5.4.11
-  video_player: ^0.10.12+5
-  chewie: ^0.9.10
-  file_picker: ^2.0.8+1
-  image_picker: ^0.6.7+2
-  flutter_keyboard_visibility: ^3.2.1
-  stream_chat: ^0.2.11
   emojis: ^0.9.3
+  video_player: ^1.0.0
+  chewie: ^0.10.4
+  file_picker: ^2.0.12
+  image_picker: ^0.6.7+2
+  flutter_keyboard_visibility: ^3.3.0
+  stream_chat: ^0.2.11
   mime: ^0.9.6+3
   visibility_detector: ^0.1.5
   http_parser: ^3.1.4