diff --git a/openair2/RRC/NR/MESSAGES/asn1_msg.c b/openair2/RRC/NR/MESSAGES/asn1_msg.c
index 75563e5093..310eec493c 100755
--- a/openair2/RRC/NR/MESSAGES/asn1_msg.c
+++ b/openair2/RRC/NR/MESSAGES/asn1_msg.c
@@ -1682,7 +1682,7 @@ void fill_initial_SpCellConfig(int uid,
 
   // We are using do_srs = 0 here because the periodic SRS will only be enabled in update_cellGroupConfig() if do_srs == 1
   initialUplinkBWP->srs_Config = calloc(1,sizeof(*initialUplinkBWP->srs_Config));
-  config_srs(initialUplinkBWP->srs_Config, scc, uid, 0);
+  config_srs(initialUplinkBWP->srs_Config, scc, NULL, uid, 0);
 
   // configure Scheduling request
   // 40 slot period 
@@ -2168,6 +2168,7 @@ void update_cellGroupConfig(NR_CellGroupConfig_t *cellGroupConfig,
       }
       config_srs(SpCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP->srs_Config,
                  scc,
+                 uecap,
                  uid,
                  configuration->do_SRS);
     }
diff --git a/openair2/RRC/NR/nr_rrc_config.c b/openair2/RRC/NR/nr_rrc_config.c
index a6089fa2bd..5ef857efe7 100644
--- a/openair2/RRC/NR/nr_rrc_config.c
+++ b/openair2/RRC/NR/nr_rrc_config.c
@@ -292,6 +292,7 @@ long rrc_get_max_nr_csrs(uint8_t max_rbs, long b_SRS) {
 
 void config_srs(NR_SetupRelease_SRS_Config_t *setup_release_srs_Config,
                 NR_ServingCellConfigCommon_t *servingcellconfigcommon,
+                NR_UE_NR_Capability_t *uecap,
                 int uid,
                 int do_srs) {
 
@@ -356,6 +357,26 @@ void config_srs(NR_SetupRelease_SRS_Config_t *setup_release_srs_Config,
   NR_SRS_Resource_t *srs_res0=calloc(1,sizeof(*srs_res0));
   srs_res0->srs_ResourceId = 0;
   srs_res0->nrofSRS_Ports = NR_SRS_Resource__nrofSRS_Ports_port1;
+  if (uecap &&
+      uecap->featureSets &&
+      uecap->featureSets->featureSetsUplink &&
+      uecap->featureSets->featureSetsUplink->list.count > 0) {
+    NR_FeatureSetUplink_t *ul_feature_setup = uecap->featureSets->featureSetsUplink->list.array[0];
+    switch (ul_feature_setup->supportedSRS_Resources->maxNumberSRS_Ports_PerResource) {
+      case NR_SRS_Resources__maxNumberSRS_Ports_PerResource_n1:
+        srs_res0->nrofSRS_Ports = NR_SRS_Resource__nrofSRS_Ports_port1;
+        break;
+      case NR_SRS_Resources__maxNumberSRS_Ports_PerResource_n2:
+        srs_res0->nrofSRS_Ports = NR_SRS_Resource__nrofSRS_Ports_ports2;
+        break;
+      case NR_SRS_Resources__maxNumberSRS_Ports_PerResource_n4:
+        srs_res0->nrofSRS_Ports = NR_SRS_Resource__nrofSRS_Ports_ports4;
+        break;
+      default:
+        LOG_E(NR_RRC, "Max Number of SRS Ports Per Resource %ld is invalid!\n",
+              ul_feature_setup->supportedSRS_Resources->maxNumberSRS_Ports_PerResource);
+    }
+  }
   srs_res0->ptrs_PortIndex = NULL;
   srs_res0->transmissionComb.present = NR_SRS_Resource__transmissionComb_PR_n2;
   srs_res0->transmissionComb.choice.n2 = calloc(1,sizeof(*srs_res0->transmissionComb.choice.n2));
diff --git a/openair2/RRC/NR/nr_rrc_config.h b/openair2/RRC/NR/nr_rrc_config.h
index fef30f18da..eb12fa71eb 100644
--- a/openair2/RRC/NR/nr_rrc_config.h
+++ b/openair2/RRC/NR/nr_rrc_config.h
@@ -125,6 +125,7 @@ void config_csiim(int do_csirs, int dl_antenna_ports, int curr_bwp,
                   NR_CSI_MeasConfig_t *csi_MeasConfig);
 void config_srs(NR_SetupRelease_SRS_Config_t *setup_release_srs_Config,
                 NR_ServingCellConfigCommon_t *servingcellconfigcommon,
+                NR_UE_NR_Capability_t *uecap,
                 int uid,
                 int do_srs);
 void set_dl_mcs_table(int scs, NR_UE_NR_Capability_t *cap,