diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
index 03ec701880..5c4ee88a06 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
@@ -3261,6 +3261,9 @@ void reset_beam_status(NR_beam_info_t *beam_info, int frame, int slot, int beam_
 
 void beam_selection_procedures(gNB_MAC_INST *mac, NR_UE_info_t *UE)
 {
+  // do not perform beam procedures if there is no beam information
+  if (!mac->beam_info.beam_allocation)
+    return;
   RSRP_report_t *rsrp_report = &UE->UE_sched_ctrl.CSI_report.ssb_rsrp_report;
   // simple beam switching algorithm -> we select beam with highest RSRP from CSI report
   int new_bf_index = get_fapi_beamforming_index(mac, rsrp_report->resource_id[0]);
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci1.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci1.conf
index ff1de3cc21..c7d8cb3269 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci1.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci1.conf
@@ -113,7 +113,7 @@ gNBs =
         hoppingId                                                  = 40;
         p0_nominal                                                 = -90;
 
-      ssb_PositionsInBurst_Bitmap                                  = 3;
+      ssb_PositionsInBurst_Bitmap                                  = 2;
 
 # ssb_periodicityServingCell
 # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1