diff --git a/ThirdParty/Netcode.IO.NET/Core/EncryptionManager.cs b/ThirdParty/Netcode.IO.NET/Core/EncryptionManager.cs
index 7eb16f5..28850d8 100644
--- a/ThirdParty/Netcode.IO.NET/Core/EncryptionManager.cs
+++ b/ThirdParty/Netcode.IO.NET/Core/EncryptionManager.cs
@@ -186,7 +186,9 @@ public int FindEncryptionMapping(EndPoint address, double time)
 					(encryptionMappings[i].ExpireTime < 0.0 || encryptionMappings[i].ExpireTime >= time))
 				{
 					encryptionMappings[i].LastAccessTime = time;
-					return i;
+                    // Hotfix, sometimes expiry time wasn't being updated and this caused clients to disconnect..
+                    encryptionMappings[i].ExpireTime = time + Defines.NETCODE_TIMEOUT_SECONDS;
+                    return i;
 				}
 			}