diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart
index 2b0294d0d..c2c4822a2 100644
--- a/lib/pages/chat/events/html_message.dart
+++ b/lib/pages/chat/events/html_message.dart
@@ -580,9 +580,9 @@ class HtmlMessage extends StatelessWidget {
     return SelectionArea(
       child: GestureDetector(
         onTap: () {
-          if (!isOverlay) {
+          if (!isOverlay && pangeaMessageEvent != null) {
             controller.showToolbar(
-              event,
+              pangeaMessageEvent!.event,
               pangeaMessageEvent: pangeaMessageEvent,
               nextEvent: nextEvent,
               prevEvent: prevEvent,
diff --git a/lib/pangea/toolbar/widgets/overlay_message.dart b/lib/pangea/toolbar/widgets/overlay_message.dart
index 87578108f..d477537c2 100644
--- a/lib/pangea/toolbar/widgets/overlay_message.dart
+++ b/lib/pangea/toolbar/widgets/overlay_message.dart
@@ -180,7 +180,7 @@ class OverlayMessage extends StatelessWidget {
                   },
                 ),
               MessageContent(
-                event,
+                event.getDisplayEvent(timeline),
                 textColor: textColor,
                 pangeaMessageEvent: pangeaMessageEvent,
                 immersionMode: immersionMode,