diff --git a/HAA/HAA_Main/main/header.h b/HAA/HAA_Main/main/header.h
index 92b01b95..c1542c68 100644
--- a/HAA/HAA_Main/main/header.h
+++ b/HAA/HAA_Main/main/header.h
@@ -11,7 +11,7 @@
 #include "../../common/common_headers.h"
 
 // Version
-#define HAA_FIRMWARE_VERSION                "12.14.2"
+#define HAA_FIRMWARE_VERSION                "12.14.3"
 #define HAA_FIRMWARE_BETA_REVISION          ""          // Format: "b01"
 #define HAA_FIRMWARE_CODENAME               "Merlin"
 
diff --git a/libs/homekit-rsf/src/json.h b/libs/homekit-rsf/src/json.h
index c2aa3635..837bfd98 100644
--- a/libs/homekit-rsf/src/json.h
+++ b/libs/homekit-rsf/src/json.h
@@ -13,9 +13,8 @@
 
 #define JSON_MAX_DEPTH              (30)
 
-#ifndef HOMEKIT_JSON_BUFFER_SIZE
-#define HOMEKIT_JSON_BUFFER_SIZE    (1024)
-#endif
+#define HOMEKIT_JSON_BUFFER_SIZE    (1442)
+
 
 typedef int (*json_flush_callback)(uint8_t *buffer, size_t size, void *context);
 typedef struct _json_stream {
diff --git a/libs/homekit-rsf/src/server.c b/libs/homekit-rsf/src/server.c
index 87bea0bc..e638c1b6 100644
--- a/libs/homekit-rsf/src/server.c
+++ b/libs/homekit-rsf/src/server.c
@@ -45,8 +45,6 @@
 #include "pairing.h"
 #include "storage.h"
 #include "query_params.h"
-
-#define HOMEKIT_JSON_BUFFER_SIZE                (1024)
 #include "json.h"
 #include "debug.h"
 #include "port.h"
@@ -157,6 +155,7 @@ typedef struct _notification {
 } notification_t;
 
 #define BUFFER_DATA_SIZE        (HOMEKIT_JSON_BUFFER_SIZE)  // Used by JSON buffer too. Must be 2 bytes reserved for client_send_chunk() end
+#define ENCRYPTED_DATA_SIZE     (768)
 
 typedef struct {
     char *accessory_id;
@@ -182,7 +181,7 @@ typedef struct {
     json_stream json;
     
     byte data[BUFFER_DATA_SIZE + 16 + 2];   // Used by JSON buffer too. Must be 2 bytes reserved for client_send_chunk() end; there are 18.
-    byte encrypted[BUFFER_DATA_SIZE + 16 + 2];
+    byte encrypted[ENCRYPTED_DATA_SIZE + 16 + 2];
     
     fd_set fds;
 } homekit_server_t;