diff --git a/src/protocols/rdp/client.h b/src/protocols/rdp/client.h
index be14e19e..41b887dc 100644
--- a/src/protocols/rdp/client.h
+++ b/src/protocols/rdp/client.h
@@ -61,7 +61,7 @@
  * milliseconds. If the server is silent for at least this amount of time, the
  * frame will be considered finished.
  */
-#define GUAC_RDP_FRAME_TIMEOUT 15
+#define GUAC_RDP_FRAME_TIMEOUT 0
 
 /**
  * Client data that will remain accessible through the guac_client.
diff --git a/src/protocols/vnc/client.h b/src/protocols/vnc/client.h
index 2f892566..bceb74f8 100644
--- a/src/protocols/vnc/client.h
+++ b/src/protocols/vnc/client.h
@@ -54,7 +54,7 @@
  * milliseconds. If the server is silent for at least this amount of time, the
  * frame will be considered finished.
  */
-#define GUAC_VNC_FRAME_TIMEOUT 15
+#define GUAC_VNC_FRAME_TIMEOUT 0
 
 extern char* __GUAC_CLIENT;