diff --git a/TShockAPI/ConfigFile.cs b/TShockAPI/ConfigFile.cs
index 84a923ee..152a8ab8 100755
--- a/TShockAPI/ConfigFile.cs
+++ b/TShockAPI/ConfigFile.cs
@@ -274,6 +274,10 @@ namespace TShockAPI
 
 		[Description("Disables a player if this number of tiles is painted within 1 second.")] public int TilePaintThreshold = 15;
 
+		[Description("Enables max packet bufferer size.")] public bool EnableMaxBytesInBuffer = false;
+
+		[Description("Number of bytes in the packet buffer before we disconnect the player.")] public int MaxBytesInBuffer = 5242880;
+
         /// <summary>
         /// Reads a configuration file from a given path
         /// </summary>
diff --git a/TShockAPI/PacketBufferer.cs b/TShockAPI/PacketBufferer.cs
index ebab27d1..c656fdbb 100644
--- a/TShockAPI/PacketBufferer.cs
+++ b/TShockAPI/PacketBufferer.cs
@@ -182,6 +182,12 @@ namespace TShockAPI
 				{
 					buffers[socket.whoAmI].AddRange(ms.ToArray());
 				}
+
+				if (TShock.Config.EnableMaxBytesInBuffer && buffers[socket.whoAmI].Count > TShock.Config.MaxBytesInBuffer)
+				{
+					buffers[socket.whoAmI].Clear();
+					socket.kill = true;
+				}
 			}
 		}