diff --git a/lib/pages/chat_search/chat_search_page.dart b/lib/pages/chat_search/chat_search_page.dart
index f459ed9f9..40109d0b6 100644
--- a/lib/pages/chat_search/chat_search_page.dart
+++ b/lib/pages/chat_search/chat_search_page.dart
@@ -110,6 +110,16 @@ class ChatSearchController extends State<ChatSearchPage>
               result.$2,
             ),
           )
+          // Deduplication workaround for
+          // https://github.com/famedly/matrix-dart-sdk/issues/1831
+          .map(
+            (result) => (
+              <String, Event>{
+                for (final event in result.$1) event.eventId: event,
+              }.values.toList(),
+              result.$2,
+            ),
+          )
           .asBroadcastStream();
     });
   }
@@ -140,6 +150,16 @@ class ChatSearchController extends State<ChatSearchPage>
               result.$2,
             ),
           )
+          // Deduplication workaround for
+          // https://github.com/famedly/matrix-dart-sdk/issues/1831
+          .map(
+            (result) => (
+              <String, Event>{
+                for (final event in result.$1) event.eventId: event,
+              }.values.toList(),
+              result.$2,
+            ),
+          )
           .asBroadcastStream();
     });
   }