diff --git a/drivers/usbdev/Kconfig b/drivers/usbdev/Kconfig
index e1642858c7d..d9b855ee46e 100644
--- a/drivers/usbdev/Kconfig
+++ b/drivers/usbdev/Kconfig
@@ -265,6 +265,12 @@ config COMPOSITE_MSFT_OS_DESCRIPTORS
 		Enabling this feature in composite driver will pass these requests
 		onwards to the interface drivers.
 
+config COMPOSITE_DEVICES
+	int "Max class object for composite device"
+	default 8
+	---help---
+		Composite device class object number.
+
 endif
 
 config PL2303
diff --git a/drivers/usbdev/composite.h b/drivers/usbdev/composite.h
index 308501579cd..f98bb595d0b 100644
--- a/drivers/usbdev/composite.h
+++ b/drivers/usbdev/composite.h
@@ -40,7 +40,7 @@
  ****************************************************************************/
 
 #ifdef CONFIG_USBDEV_COMPOSITE
-#  define NUM_DEVICES_TO_HANDLE       (8)
+#  define NUM_DEVICES_TO_HANDLE       (CONFIG_COMPOSITE_DEVICES)
 #else
 #  define NUM_DEVICES_TO_HANDLE       (1)
 #endif