diff --git a/FFXIVClassic Lobby Server/ClientConnection.cs b/FFXIVClassic Lobby Server/ClientConnection.cs
index 91be70d6..e7c474f2 100644
--- a/FFXIVClassic Lobby Server/ClientConnection.cs	
+++ b/FFXIVClassic Lobby Server/ClientConnection.cs	
@@ -40,6 +40,9 @@ namespace FFXIVClassic_Lobby_Server
 
         public void QueuePacket(BasePacket packet)
         {
+            if (SendPacketQueue.Count == SendPacketQueue.BoundedCapacity - 1)
+                FlushQueuedSendPackets();
+
             SendPacketQueue.Add(packet);
         }
 
diff --git a/FFXIVClassic World Server/DataObjects/ClientConnection.cs b/FFXIVClassic World Server/DataObjects/ClientConnection.cs
index 7c3427a8..d9da3ba1 100644
--- a/FFXIVClassic World Server/DataObjects/ClientConnection.cs	
+++ b/FFXIVClassic World Server/DataObjects/ClientConnection.cs	
@@ -20,6 +20,9 @@ namespace FFXIVClassic_World_Server
 
         public void QueuePacket(BasePacket packet)
         {
+            if (SendPacketQueue.Count == SendPacketQueue.BoundedCapacity - 1)
+                FlushQueuedSendPackets();
+
             SendPacketQueue.Add(packet);
         }