diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
index 9598bf1ad6..4ce570bc12 100644
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
@@ -484,12 +484,12 @@ static void *ue_tun_read_thread(void *_)
     ctxt.rnti = rnti;
 
     bool dc = SDAP_HDR_UL_DATA_PDU;
-    uint8_t qfi = 7;
-    int pdusession_id = 10;
+    extern uint8_t nas_qfi;
+    extern uint8_t nas_pduid;
 
     sdap_data_req(&ctxt, SRB_FLAG_NO, rb_id, RLC_MUI_UNDEFINED,
                   RLC_SDU_CONFIRM_NO, len, (unsigned char *)rx_buf,
-                  PDCP_TRANSMISSION_MODE_DATA, NULL, NULL, qfi, dc, pdusession_id);
+                  PDCP_TRANSMISSION_MODE_DATA, NULL, NULL, nas_qfi, dc, nas_pduid);
   }
 
   return NULL;
diff --git a/openair2/SDAP/nr_sdap/nr_sdap.c b/openair2/SDAP/nr_sdap/nr_sdap.c
index dd7a76920d..6457843ae0 100644
--- a/openair2/SDAP/nr_sdap/nr_sdap.c
+++ b/openair2/SDAP/nr_sdap/nr_sdap.c
@@ -21,6 +21,9 @@
 
 #include "nr_sdap.h"
 
+uint8_t nas_qfi;
+uint8_t nas_pduid;
+
 bool sdap_data_req(protocol_ctxt_t *ctxt_p,
                    const srb_flag_t srb_flag,
                    const rb_id_t rb_id,
@@ -84,3 +87,9 @@ void sdap_data_ind(rb_id_t pdcp_entity,
                          buf,
                          size);
 }
+
+void set_qfi_pduid(uint8_t qfi, uint8_t pduid){
+  nas_qfi = qfi;
+  nas_pduid = pduid;
+  return;
+}
diff --git a/openair2/SDAP/nr_sdap/nr_sdap.h b/openair2/SDAP/nr_sdap/nr_sdap.h
index 5959ca1558..ea4fe7f74d 100644
--- a/openair2/SDAP/nr_sdap/nr_sdap.h
+++ b/openair2/SDAP/nr_sdap/nr_sdap.h
@@ -62,4 +62,6 @@ void sdap_data_ind(rb_id_t pdcp_entity,
                    int size
                   );
 
+void set_qfi_pduid(uint8_t qfi, uint8_t pduid);
+
 #endif
diff --git a/openair3/NAS/NR_UE/nr_nas_msg_sim.c b/openair3/NAS/NR_UE/nr_nas_msg_sim.c
index e151fec9b4..43c3b56aa4 100644
--- a/openair3/NAS/NR_UE/nr_nas_msg_sim.c
+++ b/openair3/NAS/NR_UE/nr_nas_msg_sim.c
@@ -44,6 +44,7 @@
 #include <openair3/NAS/COMMON/NR_NAS_defs.h>
 #include <openair1/PHY/phy_extern_nr_ue.h>
 #include <openair1/SIMULATION/ETH_TRANSPORT/proto.h>
+#include "openair2/SDAP/nr_sdap/nr_sdap.h"
 
 uint8_t  *registration_request_buf;
 uint32_t  registration_request_len;
@@ -915,7 +916,7 @@ void *nas_nrue_task(void *args_p)
               payload_container = pdu_buffer + offset;
             }
             offset = 0;
-
+            uint8_t pdu_id = *(pdu_buffer+14);
             while(offset < payload_container_length) {
 	      // Fixme: this is not good 'type' 0x29 searching in TLV like structure
 	      // AND fix dirsty code copy hereafter of the same!!!
@@ -929,9 +930,13 @@ void *nas_nrue_task(void *args_p)
                     *(payload_container+offset+3), *(payload_container+offset+4),
                     *(payload_container+offset+5), *(payload_container+offset+6));
                   nas_config(1,third_octet,fourth_octet,"oaitun_ue");
-                  break;
                 }
               }
+              if (*(payload_container + offset) == 0x79) {
+                uint8_t qfi = *(payload_container+offset+3);
+                set_qfi_pduid(qfi, pdu_id);
+                break;
+              }
               offset++;
             }
           }