diff --git a/main/rf.cpp b/main/rf.cpp
index 66f8217..5fdff86 100644
--- a/main/rf.cpp
+++ b/main/rf.cpp
@@ -654,9 +654,9 @@ extern "C"
 #ifdef WITH_PAW
    static uint8_t PAWtxBackOff = 4;
 #ifdef WITH_LORAWAN
-   if(!WANtx && TxPkt0 && WANdev.State!=1 && WANdev.State!=3)         // if no WAN transmission/reception scheduled
+   if(!WANtx && TxPkt0 && TxPkt0->Packet.Header.AddrType && WANdev.State!=1 && WANdev.State!=3)         // if no WAN transmission/reception scheduled
 #else
-   if(TxPkt0 && TxPkt0->AddrType)
+   if(TxPkt0 && TxPkt0->Packet.Header.AddrType)
 #endif
    { PAW_Packet Packet; Packet.Clear();
      OGN1_Packet TxPkt = TxPkt0->Packet;