diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c
index 428d1b65c2..1b2605afbd 100644
--- a/executables/nr-softmodem.c
+++ b/executables/nr-softmodem.c
@@ -807,12 +807,11 @@ if(!IS_SOFTMODEM_NOS1)
   if(IS_SOFTMODEM_NOS1)
     init_pdcp();
 
+  if (RC.nb_nr_L1_inst > 0)
+    RCconfig_NR_L1();
   if (RC.nb_nr_inst > 0)  {
     // don't create if node doesn't connect to RRC/S1/GTP
-    RCconfig_NR_L1();
     AssertFatal(create_gNB_tasks(1) == 0,"cannot create ITTI tasks\n");
-  } else {
-    AssertFatal(1==0,"RC.nb_nr_inst should have been already initialized in get_options()");
   }
 
   /* Start the agent. If it is turned off in the configuration, it won't start */
diff --git a/openair2/GNB_APP/gnb_config.c b/openair2/GNB_APP/gnb_config.c
index 115073a334..76f9a8c99e 100644
--- a/openair2/GNB_APP/gnb_config.c
+++ b/openair2/GNB_APP/gnb_config.c
@@ -430,7 +430,11 @@ void RCconfig_NR_L1(void) {
 
         mac_top_init_gNB();
 
-        configure_nr_nfapi_pnf(RC.gNB[j]->eth_params_n.remote_addr, RC.gNB[j]->eth_params_n.remote_portc, RC.gNB[j]->eth_params_n.my_addr, RC.gNB[j]->eth_params_n.my_portd, RC.gNB[j]->eth_params_n     .remote_portd);
+        configure_nr_nfapi_pnf(RC.gNB[j]->eth_params_n.remote_addr,
+                               RC.gNB[j]->eth_params_n.remote_portc,
+                               RC.gNB[j]->eth_params_n.my_addr,
+                               RC.gNB[j]->eth_params_n.my_portd,
+                               RC.gNB[j]->eth_params_n.remote_portd);
       }else { // other midhaul
       } 
     }// for (j = 0; j < RC.nb_nr_L1_inst; j++)