diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e9b9642..62efc4ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.17+1
+
+- Fix mention tap bug
+
 ## 0.2.17
 
 - Expose messageInputDecoration as part of the theme
diff --git a/lib/src/message_text.dart b/lib/src/message_text.dart
index a043c53a..64fc855d 100644
--- a/lib/src/message_text.dart
+++ b/lib/src/message_text.dart
@@ -31,7 +31,7 @@ class MessageText extends StatelessWidget {
       ) {
         if (link.startsWith('@')) {
           final mentionedUser = message.mentionedUsers.firstWhere(
-            (u) => '@${u.name.replaceAll(' ', '')}' == link,
+            (u) => '@${u.name}' == link,
             orElse: () => null,
           );
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 5304c039..a400260e 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.17
+version: 0.2.17+1
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues