diff --git a/src/libguac/guacamole/client-constants.h b/src/libguac/guacamole/client-constants.h
index daf45b0f8..5683278dc 100644
--- a/src/libguac/guacamole/client-constants.h
+++ b/src/libguac/guacamole/client-constants.h
@@ -30,7 +30,7 @@
  * The maximum number of inbound or outbound streams supported by any one
  * guac_client.
  */
-#define GUAC_CLIENT_MAX_STREAMS 64
+#define GUAC_CLIENT_MAX_STREAMS 512
 
 /**
  * The index of a closed stream.
diff --git a/src/libguac/guacamole/user-constants.h b/src/libguac/guacamole/user-constants.h
index 0da48c0bb..40832c16c 100644
--- a/src/libguac/guacamole/user-constants.h
+++ b/src/libguac/guacamole/user-constants.h
@@ -35,7 +35,7 @@
  * The maximum number of inbound or outbound streams supported by any one
  * guac_user.
  */
-#define GUAC_USER_MAX_STREAMS 64
+#define GUAC_USER_MAX_STREAMS 512
 
 /**
  * The index of a closed stream.