diff --git a/meshview/templates/chat.html b/meshview/templates/chat.html
index aab9224..29f7452 100644
--- a/meshview/templates/chat.html
+++ b/meshview/templates/chat.html
@@ -133,8 +133,8 @@ async function fetchUpdates() {
                     </span>
                     <span class="col-5 message">
                         ${escapeHtml(packet.payload)}
-                        ${packet.raw_mesh_packet && packet.raw_mesh_packet.decoded && packet.raw_mesh_packet.decoded.reply_id
-                            ? `<span class="replying-to">(Replying to: <a href="/packet/${packet.raw_mesh_packet.decoded.reply_id}">${packet.raw_mesh_packet.decoded.reply_id}</a>)</span>`
+                        ${packet.reply_id
+                            ? `<span class="replying-to">(Replying to: <a href="/packet/${packet.reply_id}">${packet.reply_id}</a>)</span>`
                             : ''}
                     </span>
                 `;
diff --git a/meshview/web.py b/meshview/web.py
index b305902..32861ce 100644
--- a/meshview/web.py
+++ b/meshview/web.py
@@ -1287,14 +1287,26 @@ async def chat_updates(request):
         filtered_packets = [p for p in ui_packets if not SEQ_REGEX.fullmatch(p.payload)]
         new_packets = [p for p in filtered_packets if p.import_time > last_time]
 
-        packets_data = [{
-            "id": p.id,
-            "import_time": p.import_time.isoformat(),
-            "channel": p.from_node.channel if p.from_node else "",
-            "from_node_id": p.from_node_id,
-            "long_name": p.from_node.long_name if p.from_node else "",
-            "payload": p.payload,
-        } for p in new_packets]
+        packets_data = []
+        for p in new_packets:
+            reply_id = None
+            if getattr(p, 'raw_mesh_packet', None):
+                decoded = getattr(p.raw_mesh_packet, 'decoded', None)
+                if decoded:
+                    reply_id = getattr(decoded, 'reply_id', None)
+
+            packet_dict = {
+                "id": p.id,
+                "import_time": p.import_time.isoformat(),
+                "channel": p.from_node.channel if p.from_node else "",
+                "from_node_id": p.from_node_id,
+                "long_name": p.from_node.long_name if p.from_node else "",
+                "payload": p.payload,
+            }
+            if reply_id:
+                packet_dict["reply_id"] = reply_id
+
+            packets_data.append(packet_dict)
 
         response = {
             "packets": packets_data