diff --git a/backend/WebUI/api_charging.go b/backend/WebUI/api_charging.go
index b46b1f8f..3f92b070 100644
--- a/backend/WebUI/api_charging.go
+++ b/backend/WebUI/api_charging.go
@@ -89,7 +89,10 @@ func GetChargingData(c *gin.Context) {
 		return
 	}
 
-	filter := bson.M{"chargingMethod": chargingMethod}
+	filter := bson.M{
+		"chargingMethod": chargingMethod,
+		"ratingGroup":    nil,
+	}
 	chargingDataInterface, err := mongoapi.RestfulAPIGetMany(chargingDataColl, filter)
 	if err != nil {
 		logger.BillingLog.Errorf("mongoapi error: %+v", err)
diff --git a/frontend/src/pages/SubscriberCreate.tsx b/frontend/src/pages/SubscriberCreate.tsx
index 8b17fb99..4a6a918a 100644
--- a/frontend/src/pages/SubscriberCreate.tsx
+++ b/frontend/src/pages/SubscriberCreate.tsx
@@ -1757,7 +1757,7 @@ export default function SubscriberCreate() {
                 </TableRow>
               </TableBody>
             </Table>
-            {chargingConfig(undefined, row.singleNssai!, undefined)}
+            {chargingConfig("", row.singleNssai!, "")}
             {row.dnnConfigurations &&
               Object.keys(row.dnnConfigurations!).map((dnn) => (
                 <div