diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/avro/AvroJsonConverter.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/avro/AvroJsonConverter.java
index c7a092e528..f58642c552 100755
--- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/avro/AvroJsonConverter.java
+++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/avro/AvroJsonConverter.java
@@ -115,7 +115,7 @@ public String endcodeToJson(T record) throws IOException{
      */
     public byte[] encodeToJsonBytes(T record) throws IOException{
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        jsonEncoder = EncoderFactory.get().jsonEncoder(this.schema, baos, false, true);
+        jsonEncoder = EncoderFactory.get().jsonEncoder(this.schema, baos, true);
         avroWriter.write(record, jsonEncoder);
         jsonEncoder.flush();
         baos.flush();
diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/avro/GenericAvroConverter.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/avro/GenericAvroConverter.java
index 1d98147f45..650a773386 100644
--- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/avro/GenericAvroConverter.java
+++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/avro/GenericAvroConverter.java
@@ -156,7 +156,7 @@ public String encodeToJson(T record) throws IOException{
      */
     public byte[] encodeToJsonBytes(T record) throws IOException{
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        jsonEncoder = EncoderFactory.get().jsonEncoder(this.schema, baos, false, true);
+        jsonEncoder = EncoderFactory.get().jsonEncoder(this.schema, baos, true);
         datumWriter.write(record, jsonEncoder);
         jsonEncoder.flush();
         baos.flush();
diff --git a/pom.xml b/pom.xml
index 929819d7ac..89ec1d919b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,8 +54,8 @@ Copyright 2014-2016 CyberVision, Inc.
         <flume.version>1.5.0.1</flume.version>
 
         <netty.version>4.0.34.Final</netty.version>
-        <avro-kaa.version>1.8.1-KAA</avro-kaa.version>
-        <avro.version>1.8.1</avro.version>
+        <avro-kaa.version>1.7.5-KAA</avro-kaa.version>
+        <avro.version>1.7.5</avro.version>
         <apache.velocity>1.7</apache.velocity>
         <zookeeper.version>3.4.6</zookeeper.version>
         <curator.version>2.9.0</curator.version>
@@ -458,7 +458,7 @@ Copyright 2014-2016 CyberVision, Inc.
                                             avro-maven-plugin
                                         </artifactId>
                                         <versionRange>
-                                            [1.7.5,)
+                                            [1.7.5-KAA,)
                                         </versionRange>
                                         <goals>
                                             <goal>schema</goal>
@@ -951,7 +951,7 @@ Copyright 2014-2016 CyberVision, Inc.
             <dependency>
                 <groupId>org.apache.avro</groupId>
                 <artifactId>avro-compiler</artifactId>
-                <version>${avro.version}</version>
+                <version>${avro-kaa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.avro</groupId>
@@ -961,7 +961,7 @@ Copyright 2014-2016 CyberVision, Inc.
             <dependency>
                 <groupId>org.apache.avro</groupId>
                 <artifactId>avro-mapred</artifactId>
-                <version>${avro.version}</version>
+                <version>${avro-kaa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.velocity</groupId>