diff --git a/config/esp32/args.gni b/config/esp32/args.gni
index f818a37f258e49..c8de67ddc87506 100644
--- a/config/esp32/args.gni
+++ b/config/esp32/args.gni
@@ -26,7 +26,7 @@ lwip_platform = "external"
 
 #Enabling this causes some error
 #chip_inet_config_enable_tun_endpoint = false
-chip_inet_config_enable_tcp_endpoint = false
+chip_inet_config_enable_tcp_endpoint = true
 chip_inet_config_enable_udp_endpoint = true
 
 custom_toolchain = "//third_party/connectedhomeip/config/esp32/toolchain:esp32"
diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig
index f8885b77e9739f..f5f4c1437941d0 100644
--- a/config/esp32/components/chip/Kconfig
+++ b/config/esp32/components/chip/Kconfig
@@ -267,8 +267,8 @@ menu "CHIP Core"
             depends on ENABLE_OTA_REQUESTOR
             default n
             help
-                Enable this option for delta OTA image updates. 
-                Delta OTA updates allow for smaller, more efficient updates by only 
+                Enable this option for delta OTA image updates.
+                Delta OTA updates allow for smaller, more efficient updates by only
                 sending the changes between the current and new firmware versions.
 
         config OTA_AUTO_REBOOT_ON_APPLY
@@ -1176,6 +1176,15 @@ menu "CHIP Device Layer"
 
     endmenu
 
+    menu "Matter TCP payload options"
+        config MAX_LARGE_BUFFER_SIZE_BYTES
+            int "Max buffer size for TCP payloads"
+            default 1530
+            help
+                Max TCP payload buffer size.
+
+    endmenu
+
     menu "Network Commissioning Driver Endpoint Id"
         config THREAD_NETWORK_COMMISSIONING_DRIVER
             bool "Use the generic Thread network commissioning driver"
diff --git a/src/platform/ESP32/CHIPPlatformConfig.h b/src/platform/ESP32/CHIPPlatformConfig.h
index e5b189772662d1..12686a3e93aca3 100644
--- a/src/platform/ESP32/CHIPPlatformConfig.h
+++ b/src/platform/ESP32/CHIPPlatformConfig.h
@@ -164,3 +164,7 @@
 #else
 #define CHIP_SYSTEM_CONFIG_POOL_USE_HEAP 0
 #endif
+
+#ifdef CONFIG_MAX_LARGE_BUFFER_SIZE_BYTES
+#define CHIP_SYSTEM_CONFIG_MAX_LARGE_BUFFER_SIZE_BYTES CONFIG_MAX_LARGE_BUFFER_SIZE_BYTES
+#endif
\ No newline at end of file