diff --git a/libfreerdp/core/client.h b/libfreerdp/core/client.h
index 3f1e1f409..e98531488 100644
--- a/libfreerdp/core/client.h
+++ b/libfreerdp/core/client.h
@@ -35,7 +35,7 @@
 #include <freerdp/client/drdynvc.h>
 #include <freerdp/channels/channels.h>
 
-#define CHANNEL_MAX_COUNT 30
+#define CHANNEL_MAX_COUNT 31
 
 struct rdp_channel_client_data
 {
diff --git a/libfreerdp/core/gcc.c b/libfreerdp/core/gcc.c
index 3dac9c0e7..410a974a4 100644
--- a/libfreerdp/core/gcc.c
+++ b/libfreerdp/core/gcc.c
@@ -1526,7 +1526,7 @@ BOOL gcc_read_client_network_data(wStream* s, rdpMcs* mcs, UINT16 blockLength)
 	if (blockLength < 4 + mcs->channelCount * 12)
 		return FALSE;
 
-	if (mcs->channelCount > 16)
+	if (mcs->channelCount > CHANNEL_MAX_COUNT)
 		return FALSE;
 
 	/* channelDefArray */
diff --git a/winpr/include/winpr/wtsapi.h b/winpr/include/winpr/wtsapi.h
index eb546be31..dcdf8d381 100644
--- a/winpr/include/winpr/wtsapi.h
+++ b/winpr/include/winpr/wtsapi.h
@@ -66,7 +66,7 @@
 #define CHANNEL_OPTION_SHOW_PROTOCOL			0x00200000
 #define CHANNEL_OPTION_REMOTE_CONTROL_PERSISTENT	0x00100000
 
-#define CHANNEL_MAX_COUNT				30
+#define CHANNEL_MAX_COUNT				31
 #define CHANNEL_NAME_LEN				7
 
 typedef struct tagCHANNEL_DEF