diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index ae6d917b0..ada6cceb4 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -477,8 +477,11 @@ class Message extends StatelessWidget {
                                                                     'body':
                                                                         '...',
                                                                   },
-                                                                  senderId: event
-                                                                      .senderId,
+                                                                  // #Pangea
+                                                                  // senderId: event
+                                                                  //     .senderId,
+                                                                  senderId: "",
+                                                                  // Pangea#
                                                                   type:
                                                                       'm.room.message',
                                                                   room: event
diff --git a/lib/pangea/toolbar/widgets/overlay_message.dart b/lib/pangea/toolbar/widgets/overlay_message.dart
index 7717303ae..ed2f8b71e 100644
--- a/lib/pangea/toolbar/widgets/overlay_message.dart
+++ b/lib/pangea/toolbar/widgets/overlay_message.dart
@@ -258,7 +258,7 @@ class OverlayMessage extends StatelessWidget {
                             'msgtype': 'm.text',
                             'body': '...',
                           },
-                          senderId: event.senderId,
+                          senderId: "",
                           type: 'm.room.message',
                           room: event.room,
                           status: EventStatus.sent,