diff --git a/Source/DisplayCluster/Private/DisplayClusterConstants.h b/Source/DisplayCluster/Private/DisplayClusterConstants.h
index 000234b302c4de1aff25d8d380ae230adbaac42c..abc132245985dec89e99e8dc110b0b55546a9b66 100644
--- a/Source/DisplayCluster/Private/DisplayClusterConstants.h
+++ b/Source/DisplayCluster/Private/DisplayClusterConstants.h
@@ -14,8 +14,8 @@ namespace DisplayClusterConstants
 		static constexpr float  ClientConnectRetryDelay     = 1.0f; // sec
 		static constexpr uint32 BarrierGameStartWaitTimeout = 80000; // ms
 		static constexpr uint32 BarrierWaitTimeout          = 10000; // ms
-		static constexpr int32  SocketBufferSize            = INT32_MAX; // bytes
-		static constexpr int32  MessageBufferSize           = INT32_MAX; // bytes
+		static constexpr int32  SocketBufferSize            = INT16_MAX; // bytes
+		static constexpr int32  MessageBufferSize           = INT16_MAX; // bytes
 	};
 
 	namespace misc