diff --git a/lib/pangea/events/event_wrappers/pangea_message_event.dart b/lib/pangea/events/event_wrappers/pangea_message_event.dart
index f065060a2..e484bfa67 100644
--- a/lib/pangea/events/event_wrappers/pangea_message_event.dart
+++ b/lib/pangea/events/event_wrappers/pangea_message_event.dart
@@ -513,12 +513,11 @@ class PangeaMessageEvent {
       return repLocal?.content;
     }
 
-    if (eventId.contains("web")) return null;
+    if (eventId.contains("Pangea Chat")) return null;
 
     // should this just be the original event body?
     // worth a conversation with the team
-    final PangeaRepresentation? basis =
-        (originalWritten ?? originalSent)?.content;
+    final PangeaRepresentation? basis = originalSent?.content;
 
     // clear representations cache so the new representation event can be added
     // when next requested
diff --git a/lib/pangea/extensions/room_events_extension.dart b/lib/pangea/extensions/room_events_extension.dart
index 799ebdb66..ca55b0c9c 100644
--- a/lib/pangea/extensions/room_events_extension.dart
+++ b/lib/pangea/extensions/room_events_extension.dart
@@ -44,7 +44,7 @@ extension EventsRoomExtension on Room {
   }) async {
     try {
       Sentry.addBreadcrumb(Breadcrumb(data: content));
-      if (parentEventId.contains("web")) {
+      if (parentEventId.contains("Pangea Chat")) {
         debugger(when: kDebugMode);
         Sentry.addBreadcrumb(
           Breadcrumb(
diff --git a/lib/pangea/toolbar/widgets/select_mode_buttons.dart b/lib/pangea/toolbar/widgets/select_mode_buttons.dart
index f00ce6863..f66756781 100644
--- a/lib/pangea/toolbar/widgets/select_mode_buttons.dart
+++ b/lib/pangea/toolbar/widgets/select_mode_buttons.dart
@@ -393,7 +393,11 @@ class SelectModeButtonsState extends State<SelectModeButtons> {
         langCode: l1Code!,
       );
 
-      widget.overlayController.setTranslation(rep!.text);
+      if (rep == null) {
+        throw Exception('Representation is null');
+      }
+
+      widget.overlayController.setTranslation(rep.text);
     } catch (e, s) {
       _translationError = e.toString();
       ErrorHandler.logError(