diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index 2ed63dd69..90bcdbfbe 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -1445,21 +1445,18 @@ class ChatController extends State<ChatPageWithRoom>
 
   void forwardEventsAction() async {
     if (selectedEvents.isEmpty) return;
+    final timeline = this.timeline;
+    if (timeline == null) return;
+
+    final forwardEvents = List<Event>.from(selectedEvents)
+        .map((event) => event.getDisplayEvent(timeline))
+        .toList();
+
     await showScaffoldDialog(
       context: context,
       builder: (context) => ShareScaffoldDialog(
-        items: selectedEvents
-            // #Pangea
-            // https://github.com/pangeachat/client/issues/2934
-            // .map((event) => ContentShareItem(event.content))
-            .map(
-              (event) => timeline != null
-                  ? ContentShareItem(
-                      event.getDisplayEvent(timeline!).content,
-                    )
-                  : ContentShareItem(event.content),
-            )
-            // Pangea#
+        items: forwardEvents
+            .map((event) => ContentShareItem(event.content))
             .toList(),
       ),
     );