From abc011aeb974d24e905cdf9babf38bcdbc99451b Mon Sep 17 00:00:00 2001
From: ford-jones <fordnicholasjones@gmail.com>
Date: Sun, 28 Sep 2025 16:26:45 +1300
Subject: [PATCH] Use channel as specified in the received packet for OLED
 screen notifications

---
 src/graphics/Screen.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index 44421e8fa..e6cee1824 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -1458,7 +1458,8 @@ int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
             }
             // === Prepare banner content ===
             const meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(packet->from);
-            const meshtastic_Channel channel = channels.getByIndex(node->channel ? node->channel : channels.getPrimaryIndex());
+            const meshtastic_Channel channel =
+                channels.getByIndex(packet->channel ? packet->channel : channels.getPrimaryIndex());
             const char *longName = (node && node->has_user) ? node->user.long_name : nullptr;
 
             const char *msgRaw = reinterpret_cast<const char *>(packet->decoded.payload.bytes);