diff --git a/openair2/RRC/NR/nr_rrc_config.c b/openair2/RRC/NR/nr_rrc_config.c
index 0c4dd0eb71..3f6a0c3374 100644
--- a/openair2/RRC/NR/nr_rrc_config.c
+++ b/openair2/RRC/NR/nr_rrc_config.c
@@ -1412,8 +1412,9 @@ void config_csi_meas_report(NR_CSI_MeasConfig_t *csi_MeasConfig,
       }
     }
   }
-  AssertFatal(resource_id>-1,"No resource for CSI measurements found\n");
-  AssertFatal(im_id>-1,"No resource for IM measurements found\n");
+  // if there are no associated resources, do not configure
+  if(resource_id < 0 || im_id < 0)
+    return;
   csirep->resourcesForChannelMeasurement=resource_id;
   csirep->csi_IM_ResourcesForInterference=calloc(1,sizeof(*csirep->csi_IM_ResourcesForInterference));
   *csirep->csi_IM_ResourcesForInterference=im_id;
@@ -1474,7 +1475,9 @@ void conig_rsrp_meas_report(NR_CSI_MeasConfig_t *csi_MeasConfig,
       }
     }
   }
-  AssertFatal(resource_id>-1,"No resource for RSRP found\n");
+  // if there are no associated resources, do not configure
+  if(resource_id < 0)
+    return;
   csirep->resourcesForChannelMeasurement=resource_id;
   csirep->csi_IM_ResourcesForInterference=NULL;
   csirep->nzp_CSI_RS_ResourcesForInterference=NULL;
diff --git a/openair2/RRC/NR/nr_rrc_proto.h b/openair2/RRC/NR/nr_rrc_proto.h
index 0b96fd0120..4fee44419f 100644
--- a/openair2/RRC/NR/nr_rrc_proto.h
+++ b/openair2/RRC/NR/nr_rrc_proto.h
@@ -31,6 +31,9 @@
  *  @{
  */
 
+#ifndef __NR_RRC_PROTO_H__
+#define __NR_RRC_PROTO_H__
+
 #include "RRC/NR/nr_rrc_defs.h"
 #include "flexran_agent_extern.h"
 #include "NR_RRCReconfiguration.h"
@@ -220,3 +223,5 @@ bool nr_rrc_pdcp_config_asn1_req(const protocol_ctxt_t *const  ctxt_pP,
                                  LTE_PMCH_InfoList_r9_t   *pmch_InfoList_r9,
                                  rb_id_t                  *const defaultDRB,
                                  struct NR_CellGroupConfig__rlc_BearerToAddModList *rlc_bearer2add_list);
+
+#endif