diff --git a/pocketgps.lua b/pocketgps.lua
index c30480f..9714404 100644
--- a/pocketgps.lua
+++ b/pocketgps.lua
@@ -231,7 +231,9 @@ local function main()
             local replyChannel = param3
             local message = param4
             
-            if channel == STATUS_CHANNEL and type(message) == "table" then
+            -- Uses Channels.match() for dual-mode safety: accepts messages on
+            -- both legacy (102) and target (4212) channels during migration.
+            if Channels.match('remoteturtle.status', channel) and type(message) == "table" then
                 handleStatus(message)
             end