diff --git a/limelight-common/ControlStream.c b/limelight-common/ControlStream.c
index 952a9ce..12723a1 100644
--- a/limelight-common/ControlStream.c
+++ b/limelight-common/ControlStream.c
@@ -602,6 +602,9 @@ int startControlStream(void) {
 
         // Ensure the connect verify ACK is sent immediately
         enet_host_flush(client);
+        
+        // Set the max peer timeout to 10 seconds
+        enet_peer_timeout(peer, ENET_PEER_TIMEOUT_LIMIT, ENET_PEER_TIMEOUT_MINIMUM, 10000);
     }
     else {
         ctlSock = connectTcpSocket(&RemoteAddr, RemoteAddrLen,