diff --git a/executables/nr-uesoftmodem.c b/executables/nr-uesoftmodem.c
index d6f2a48330..0fd9d0fc07 100644
--- a/executables/nr-uesoftmodem.c
+++ b/executables/nr-uesoftmodem.c
@@ -480,7 +480,9 @@ int main( int argc, char **argv ) {
   NB_INST=1;
   PHY_vars_UE_g = malloc(sizeof(PHY_VARS_NR_UE **));
   PHY_vars_UE_g[0] = malloc(sizeof(PHY_VARS_NR_UE *)*MAX_NUM_CCs);
-  RCconfig_nr_ue_L1();
+  if (get_softmodem_params()->emulate_l1) {
+    RCconfig_nr_ue_L1();
+  }
 
 
   if (get_softmodem_params()->do_ra)
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
index 6a9e67c90f..d330060b79 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
@@ -3795,11 +3795,6 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t
 
   LOG_D(NR_MAC, "In %s:[%d.%d]: [UE %d][RAPROC] invoking MAC for received RAR (current preamble %d)\n", __FUNCTION__, frame, slot, mod_id, preamble_index);
 
-  if (get_softmodem_params()->nsa && mac->crnti == ra->t_crnti)
-  {
-    LOG_D(MAC, "Discarding the received RAR.\n");
-    return -1;
-  }
   while (1) {
     n_subheaders++;
     if (rarh->T == 1) {
diff --git a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
index 6fd58c24c7..3d2b904e3c 100644
--- a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+++ b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
@@ -639,11 +639,6 @@ void check_and_process_dci(nfapi_nr_dl_tti_request_t *dl_tti_request,
     int slot = 0;
     NR_UE_MAC_INST_t *mac = get_mac_inst(0);
 
-    if (mac->scc == NULL && get_softmodem_params()->nsa)
-    {
-      return;
-    }
-
     if (pthread_mutex_lock(&mac->mutex_dl_info)) abort();
 
     if (dl_tti_request)