diff --git a/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClient.java b/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClient.java
index 8114e2a..5726c2b 100644
--- a/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClient.java
+++ b/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClient.java
@@ -36,7 +36,7 @@ public class RoboRallyClient {
      * @throws IOException If the server cannot be connected to
      */
     public void connect(String ipAddress, int serverPort) throws IOException {
-        client.connect(5000, ipAddress, serverPort, serverPort);
+        client.connect(1000, ipAddress, serverPort, serverPort);
     }
 
     /**
@@ -46,7 +46,7 @@ public class RoboRallyClient {
      * @return A list of server ip addresses
      */
     public List<InetAddress> getLanServers(int UDPPort) {
-        return client.discoverHosts(UDPPort, 1000);
+        return client.discoverHosts(UDPPort, 500);
     }
 
     /**