diff --git a/os/net/mac/framer/framer-802154.c b/os/net/mac/framer/framer-802154.c
index 609e40893..a55717ed1 100644
--- a/os/net/mac/framer/framer-802154.c
+++ b/os/net/mac/framer/framer-802154.c
@@ -148,8 +148,6 @@ framer_802154_setup_params(packetbuf_attr_t (*get_attr)(uint8_t type),
     params->fcf.ack_required = get_attr(PACKETBUF_ATTR_MAC_ACK);
     params->fcf.sequence_number_suppression = FRAME802154_SUPPR_SEQNO;
   }
-  /* Compress PAN ID in outgoing frames by default */
-  params->fcf.panid_compression = 1;
 
   /* Set IE Present bit */
   params->fcf.ie_list_present = get_attr(PACKETBUF_ATTR_MAC_METADATA);
@@ -211,6 +209,14 @@ framer_802154_setup_params(packetbuf_attr_t (*get_attr)(uint8_t type),
       params->fcf.dest_addr_mode = FRAME802154_LONGADDRMODE;
     }
   }
+
+  /* Suppress Source PAN ID and put Destination PAN ID by default */
+  if(params->fcf.src_addr_mode == FRAME802154_SHORTADDRMODE ||
+     params->fcf.dest_addr_mode == FRAME802154_SHORTADDRMODE) {
+    params->fcf.panid_compression = 1;
+  } else {
+    params->fcf.panid_compression = 0;
+  }
 }
 /*---------------------------------------------------------------------------*/
 static int