diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index 4a204c404..73a0447d5 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -1327,9 +1327,18 @@ class ChatController extends State<ChatPageWithRoom>
     }
     // Pangea#
     if (!event.redacted) {
-      if (selectedEvents.contains(event)) {
+      // #Pangea
+      // If previous selectedEvent has same eventId, delete previous selectedEvent
+      final matches =
+          selectedEvents.where((e) => e.eventId == event.eventId).toList();
+      if (matches.isNotEmpty) {
+        // if (selectedEvents.contains(event)) {
+        // Pangea#
         setState(
-          () => selectedEvents.remove(event),
+          // #Pangea
+          () => selectedEvents.remove(matches.first),
+          // () => selectedEvents.remove(event),
+          // Pangea#
         );
       } else {
         setState(