diff --git a/protocols/restconf/server/utils/src/main/java/org/onosproject/protocol/restconf/server/utils/parser/json/JsonToYdtListener.java b/protocols/restconf/server/utils/src/main/java/org/onosproject/protocol/restconf/server/utils/parser/json/JsonToYdtListener.java
index 546bed7..cf4e690 100755
--- a/protocols/restconf/server/utils/src/main/java/org/onosproject/protocol/restconf/server/utils/parser/json/JsonToYdtListener.java
+++ b/protocols/restconf/server/utils/src/main/java/org/onosproject/protocol/restconf/server/utils/parser/json/JsonToYdtListener.java
@@ -48,6 +48,7 @@
     private static final int INPUT_FIELD_LENGTH = 2;
     private static final String E_UNSUP_TYPE = "Unsupported node type %s " +
             "field name is %s fieldName";
+    private static final String EMPTY_STRING = "null";
 
     private Logger log = getLogger(getClass());
 
@@ -140,7 +141,8 @@
     }
 
     private void processLeafNode(NormalizedYangNode node, String value) {
-        ydtBuilder.addLeaf(node.getName(), node.getNamespace(), value);
+        String leafValue = value.equalsIgnoreCase(EMPTY_STRING) ? null : value;
+        ydtBuilder.addLeaf(node.getName(), node.getNamespace(), leafValue);
     }
 
     private void processArrayNode(NormalizedYangNode normalizedNode,