diff --git a/MeshtasticClient/Helpers/BLEManager.swift b/MeshtasticClient/Helpers/BLEManager.swift
index 2148ae2a..8c432cc7 100644
--- a/MeshtasticClient/Helpers/BLEManager.swift
+++ b/MeshtasticClient/Helpers/BLEManager.swift
@@ -962,11 +962,13 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
 					var meshPacket = MeshPacket()
 					meshPacket.to = UInt32(toUserNum)
 					meshPacket.from	= UInt32(fromUserNum)
+
+					meshPacket.decoded = dataMessage
+
 					meshPacket.decoded.isTapback = isTapback
 					if replyID > 0 {
 						meshPacket.decoded.replyID = UInt32(replyID)
 					}
-					meshPacket.decoded = dataMessage
 					meshPacket.wantAck = true
 
 					var toRadio: ToRadio!