diff --git a/drivers/usbdev/composite.h b/drivers/usbdev/composite.h
index b81fcbfbeb0..60240005535 100644
--- a/drivers/usbdev/composite.h
+++ b/drivers/usbdev/composite.h
@@ -95,7 +95,7 @@
 #  define COMPOSITE_REMOTEWAKEUP      (0)
 #endif
 
-#define NUM_DEVICES_TO_HANDLE         (4)
+#define NUM_DEVICES_TO_HANDLE         (8)
 
 /* Descriptors **************************************************************/