diff --git a/guacd/src/client.c b/guacd/src/client.c
index ce84eb51..a918f68e 100644
--- a/guacd/src/client.c
+++ b/guacd/src/client.c
@@ -135,7 +135,7 @@ void* __guac_client_input_thread(void* data) {
     guac_instruction instruction;
 
     /* Guacamole client input loop */
-    while (client->state == RUNNING && guac_read_instruction(io, &instruction) > 0) {
+    while (client->state == RUNNING && guac_read_instruction(io, GUAC_USEC_TIMEOUT, &instruction) > 0) {
 
         /* Call handler, stop on error */
         if (guac_client_handle_instruction(client, &instruction) < 0) {
diff --git a/guacd/src/daemon.c b/guacd/src/daemon.c
index 75117163..a8abecba 100644
--- a/guacd/src/daemon.c
+++ b/guacd/src/daemon.c
@@ -68,7 +68,7 @@ void* start_client_thread(void* data) {
     guac_log_info("Spawning client");
 
     /* Load and start client */
-    client = guac_get_client(thread_data->fd); 
+    client = guac_get_client(thread_data->fd, GUAC_USEC_TIMEOUT); 
 
     if (client == NULL) {
         guac_log_error("Client retrieval failed");