diff --git a/src/device/service/Tools.py b/src/device/service/Tools.py
index c17bed0b7ad8b34883179931f12b4adaefa60d3b..04ece2888465233438ee4bd7b06609cb420bfe45 100644
--- a/src/device/service/Tools.py
+++ b/src/device/service/Tools.py
@@ -136,6 +136,7 @@ def _raw_config_rules_to_grpc(
             continue
 
         resource_value = json.loads(resource_value) if isinstance(resource_value, str) else resource_value
+        if resource_value is None: resource_value = {}
         resource_value = {field_name : (field_value, False) for field_name,field_value in resource_value.items()}
         update_config_rule_custom(device_config.config_rules, resource_key, resource_value, new_action=config_action)