diff --git a/executables/nr-gnb.c b/executables/nr-gnb.c
index 1021aba1ce..4fb74c1a08 100644
--- a/executables/nr-gnb.c
+++ b/executables/nr-gnb.c
@@ -114,7 +114,10 @@ static void tx_func(processingData_L1tx_t *info)
   pushNotifiedFIFO(&gNB->resp_L1, res);
 
   int tx_slot_type = nr_slot_select(cfg, frame_tx, slot_tx);
-  if (tx_slot_type == NR_DOWNLINK_SLOT || tx_slot_type == NR_MIXED_SLOT || get_softmodem_params()->continuous_tx || IS_SOFTMODEM_RFSIM) {
+  // TODO check for analog_beam_list is a workaround while no beam API for beam
+  // selection is implemented
+  if (tx_slot_type == NR_DOWNLINK_SLOT || tx_slot_type == NR_MIXED_SLOT || get_softmodem_params()->continuous_tx || IS_SOFTMODEM_RFSIM 
+    || cfg->analog_beamforming_ve.analog_beam_list) {
     start_meas(&info->gNB->phy_proc_tx);
     phy_procedures_gNB_TX(info, frame_tx, slot_tx, 1);
 
diff --git a/openair1/SCHED_NR/nr_ru_procedures.c b/openair1/SCHED_NR/nr_ru_procedures.c
index 0546455e36..f121914f11 100644
--- a/openair1/SCHED_NR/nr_ru_procedures.c
+++ b/openair1/SCHED_NR/nr_ru_procedures.c
@@ -185,9 +185,6 @@ void nr_feptx_prec(RU_t *ru, int frame_tx, int slot_tx)
   int txdataF_offset = slot_tx * fp->samples_per_slot_wCP;
   start_meas(&ru->precoding_stats);
 
-  if (nr_slot_select(cfg,frame_tx,slot_tx) == NR_UPLINK_SLOT)
-    return;
-
   if (gNB->common_vars.analog_bf) {
     for (int i = 0; i < ru->num_beams_period; i++) {
       memcpy((void*) &ru->common.beam_id[i][slot_tx * fp->symbols_per_slot],
@@ -196,6 +193,9 @@ void nr_feptx_prec(RU_t *ru, int frame_tx, int slot_tx)
     }
   }
 
+  if (nr_slot_select(cfg,frame_tx,slot_tx) == NR_UPLINK_SLOT)
+    return;
+
   // If there is no digital beamforming we just need to copy the data to RU
   if (ru->config.dbt_config.num_dig_beams == 0 || ru->gNB_list[0]->common_vars.analog_bf) {
     for (int b = 0; b < ru->num_beams_period; b++) {