diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java
index ff4134129a..e4516cf5be 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java
@@ -123,11 +123,13 @@ public String getFormDefinition() {
         String result = null;
         FormContainer formContainer = resource.adaptTo(FormContainer.class);
         try {
-            HTMLCharacterEscapes htmlCharacterEscapes = new HTMLCharacterEscapes();
+            // commenting the below line because this is causing problem in json encoding
+            // and solving this requires huge bump in 6.5
+            // HTMLCharacterEscapes htmlCharacterEscapes = new HTMLCharacterEscapes();
             ObjectMapper mapper = new ObjectMapper();
             Writer writer = new StringWriter();
             ObjectWriter objectWriter = mapper.writerWithView(Views.Publish.class);
-            objectWriter.getFactory().setCharacterEscapes(htmlCharacterEscapes);
+            // objectWriter.getFactory().setCharacterEscapes(htmlCharacterEscapes);
             // return publish view specific properties only for runtime
             objectWriter.writeValue(writer, formContainer);
             result = writer.toString();