diff --git a/Subsurface/Source/Networking/Client.cs b/Subsurface/Source/Networking/Client.cs
index b25d056c6..0632d92f0 100644
--- a/Subsurface/Source/Networking/Client.cs
+++ b/Subsurface/Source/Networking/Client.cs
@@ -48,6 +48,10 @@ namespace Barotrauma.Networking
 
         private List<Client> kickVoters;
 
+        //when was a specific entity event last sent to the client
+        //  key = event id, value = NetTime.Now when sending
+        public Dictionary<UInt32, float> entityEventLastSent;
+
         public bool ReadyToStart;
 
         private object[] votes;
@@ -65,6 +69,7 @@ namespace Barotrauma.Networking
             lastRecvChatMsgID = ChatMessage.LastID;
 
             lastRecvEntitySpawnID = 0;
+            lastRecvEntityEventID = 0;
         }
 
         public int KickVoteCount
@@ -88,6 +93,8 @@ namespace Barotrauma.Networking
             votes = new object[Enum.GetNames(typeof(VoteType)).Length];
 
             jobPreferences = new List<JobPrefab>(JobPrefab.List.GetRange(0, 3));
+
+            entityEventLastSent = new Dictionary<UInt32, float>();
         }
 
         public static bool IsValidName(string name)
diff --git a/Subsurface/Source/Networking/GameServer.cs b/Subsurface/Source/Networking/GameServer.cs
index 6e210061c..002c1877f 100644
--- a/Subsurface/Source/Networking/GameServer.cs
+++ b/Subsurface/Source/Networking/GameServer.cs
@@ -1026,6 +1026,7 @@ namespace Barotrauma.Networking
             GameMain.LightManager.LosEnabled = false;
 
             Item.Spawner.Clear();
+            entityEventManager.Clear();
 
 #if DEBUG
             messageCount.Clear();
diff --git a/Subsurface/Source/Networking/NetEntityEvent/NetEntityEvent.cs b/Subsurface/Source/Networking/NetEntityEvent/NetEntityEvent.cs
index 12cc6219a..5528ffdea 100644
--- a/Subsurface/Source/Networking/NetEntityEvent/NetEntityEvent.cs
+++ b/Subsurface/Source/Networking/NetEntityEvent/NetEntityEvent.cs
@@ -26,6 +26,28 @@ namespace Barotrauma.Networking
         {
             this.Data = data;
         }
+
+        public bool IsDuplicate(NetEntityEvent other)
+        {
+            if (other.Entity != this.Entity) return false;
+
+            if (Data != null && other.Data != null)
+            {
+                if (Data.Length == other.Data.Length)
+                {
+                    for (int i = 0; i<Data.Length; i++)
+                    {
+                        if (Data[i] != other.Data[i]) return false;
+                    }
+                }
+                else
+                {
+                    return false;
+                }
+            }
+
+            return Data == other.Data;
+        }
     }
 
     class ServerEntityEvent : NetEntityEvent
diff --git a/Subsurface/Source/Networking/NetEntityEvent/NetEntityEventManager.cs b/Subsurface/Source/Networking/NetEntityEvent/NetEntityEventManager.cs
index 2c2448bc6..09b2ab0e9 100644
--- a/Subsurface/Source/Networking/NetEntityEvent/NetEntityEventManager.cs
+++ b/Subsurface/Source/Networking/NetEntityEvent/NetEntityEventManager.cs
@@ -10,7 +10,7 @@ namespace Barotrauma.Networking
 {
     abstract class NetEntityEventManager
     {
-        const int MaxEventsPerWrite = 255;
+        const int MaxEventsPerWrite = 64;
 
         public UInt32 LastReceivedEntityEventID
         {
@@ -58,7 +58,7 @@ namespace Barotrauma.Networking
         public void Read(NetIncomingMessage msg, float sendingTime)
         {
             UInt32 firstEventID = msg.ReadUInt32();
-            byte eventCount = msg.ReadByte();
+            int eventCount      = msg.ReadByte();
 
             for (int i = 0; i < eventCount; i++)
             {
@@ -83,7 +83,7 @@ namespace Barotrauma.Networking
                 msg.ReadPadBits();
             }            
         }
-
+        
         protected virtual void WriteEvent(NetBuffer buffer, NetEntityEvent entityEvent, Client recipient = null)
         {
             throw new NotImplementedException();
diff --git a/Subsurface/Source/Networking/NetEntityEvent/ServerEntityEventManager.cs b/Subsurface/Source/Networking/NetEntityEvent/ServerEntityEventManager.cs
index de61f5639..198dcebe5 100644
--- a/Subsurface/Source/Networking/NetEntityEvent/ServerEntityEventManager.cs
+++ b/Subsurface/Source/Networking/NetEntityEvent/ServerEntityEventManager.cs
@@ -30,6 +30,7 @@ namespace Barotrauma.Networking
 
             var newEvent = new ServerEntityEvent(entity, ID);
             if (extraData != null) newEvent.SetData(extraData);
+
             events.Add(newEvent);
         }
 
@@ -43,9 +44,22 @@ namespace Barotrauma.Networking
             List<NetEntityEvent> eventsToSync = new List<NetEntityEvent>();
             for (int i = events.Count - 1; i >= 0 && events[i].ID > client.lastRecvEntityEventID; i--)
             {
+                float lastSent = 0;
+                client.entityEventLastSent.TryGetValue(events[i].ID, out lastSent);
+
+                if (lastSent > NetTime.Now - client.Connection.AverageRoundtripTime)
+                {
+                    break;
+                }
+
                 eventsToSync.Insert(0, events[i]);
             }
             if (eventsToSync.Count == 0) return;
+            
+            foreach (NetEntityEvent entityEvent in eventsToSync)
+            {
+                client.entityEventLastSent[entityEvent.ID] = (float)NetTime.Now;
+            }
 
             Write(msg, eventsToSync, client);
         }