diff --git a/MinecraftClient/McClient.cs b/MinecraftClient/McClient.cs
index b631cb96..18ea656b 100644
--- a/MinecraftClient/McClient.cs
+++ b/MinecraftClient/McClient.cs
@@ -206,6 +206,7 @@ namespace MinecraftClient
             {
                 client = ProxyHandler.newTcpClient(host, port);
                 client.ReceiveBufferSize = 1024 * 1024;
+                client.ReceiveTimeout = 30000; // 30 seconds
                 handler = Protocol.ProtocolHandler.GetProtocolHandler(client, protocolversion, forgeInfo, this);
                 Translations.WriteLine("mcc.version_supported");