diff --git a/Source/Game/Network/WorldSocketManager.cs b/Source/Game/Network/WorldSocketManager.cs
index c6e686944..ce392b23e 100644
--- a/Source/Game/Network/WorldSocketManager.cs
+++ b/Source/Game/Network/WorldSocketManager.cs
@@ -57,11 +57,10 @@ namespace Game.Network
             try
             {
                 if (_socketSendBufferSize >= 0)
-                    sock.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.SendBuffer, _socketSendBufferSize);
+                    sock.SendBufferSize = _socketSendBufferSize;
 
                 // Set TCP_NODELAY.
-                if (_tcpNoDelay)
-                    sock.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.NoDelay, true);
+                sock.NoDelay = _tcpNoDelay;
             }
             catch (SocketException ex)
             {