diff --git a/commet/lib/ui/molecules/timeline_events/timeline_view_entry.dart b/commet/lib/ui/molecules/timeline_events/timeline_view_entry.dart
index a87130f8b..de11e4f2f 100644
--- a/commet/lib/ui/molecules/timeline_events/timeline_view_entry.dart
+++ b/commet/lib/ui/molecules/timeline_events/timeline_view_entry.dart
@@ -421,14 +421,18 @@ class TimelineViewEntryState extends State<TimelineViewEntry>
           initialIndex: widget.initialIndex);
 
     if (_widgetType == TimelineEventWidgetDisplayType.generic)
-      return TimelineEventViewGeneric(
-        timeline: widget.timeline,
-        initialIndex: widget.initialIndex,
-        room: widget.timeline.room,
-        readReceipts: readReceipts,
-        onReadReceiptsTapped: onReadReceiptsTapped,
-        key: eventKey,
-      );
+      return preferences.developerMode.value
+          ? TimelineEventViewGeneric(
+              timeline: widget.timeline,
+              initialIndex: widget.initialIndex,
+              room: widget.timeline.room,
+              readReceipts: readReceipts,
+              onReadReceiptsTapped: onReadReceiptsTapped,
+              key: eventKey,
+            )
+          : Container(
+              key: eventKey,
+            );
 
     if (_widgetType == TimelineEventWidgetDisplayType.poll) {
       return TimelineEventViewPoll(
diff --git a/pubspec.lock b/pubspec.lock
index fea9afeb9..a3bf45165 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -2424,4 +2424,4 @@ packages:
     version: "2.1.0"
 sdks:
   dart: ">=3.10.3 <4.0.0"
-  flutter: ">=3.38.4"
+  flutter: ">=3.38.4"
\ No newline at end of file