diff --git a/producer/policyauthorization.go b/producer/policyauthorization.go
index 15f1ed4a..acfaaaa4 100644
--- a/producer/policyauthorization.go
+++ b/producer/policyauthorization.go
@@ -1847,15 +1847,11 @@ func updateQosInMedSubComp(qosData *models.QosData, comp *models.MediaComponent,
 	}
 
 	// update Downlink MBR
-	if maxBwDl == 0.0 {
-		updatedQosData.MaxbrDl = comp.MarBwDl
-	} else {
+	if maxBwDl != 0.0 {
 		updatedQosData.MaxbrDl = pcf_context.ConvertBitRateToString(maxBwDl)
 	}
 	// update Uplink MBR
-	if maxBwUl == 0.0 {
-		updatedQosData.MaxbrUl = comp.MarBwUl
-	} else {
+	if maxBwUl != 0.0 {
 		updatedQosData.MaxbrUl = pcf_context.ConvertBitRateToString(maxBwUl)
 	}
 	// if gbr == 0 then assign gbr = mbr
@@ -1867,6 +1863,11 @@ func updateQosInMedSubComp(qosData *models.QosData, comp *models.MediaComponent,
 	if minBwUl != 0.0 {
 		updatedQosData.GbrUl = pcf_context.ConvertBitRateToString(minBwUl)
 	}
+
+	if maxBwUl == 0 && maxBwDl == 0 {
+		logger.PolicyAuthorizationlog.Debugf(
+			"MediaSubComp produced zero bandwidth, keeping existing QoS unchanged")
+	}
 	return updatedQosData, ulExist, dlExist
 }