diff --git a/drivers/usb/udc/Kconfig b/drivers/usb/udc/Kconfig
index 1711ebdc038..997da20d7cb 100644
--- a/drivers/usb/udc/Kconfig
+++ b/drivers/usb/udc/Kconfig
@@ -15,7 +15,11 @@ config UDC_DRIVER_HAS_HIGH_SPEED_SUPPORT
 	bool
 
 config UDC_DRIVER_HIGH_SPEED_SUPPORT_ENABLED
-	bool
+	bool "Allow High-Speed chirp"
+	default y if UDC_DRIVER_HAS_HIGH_SPEED_SUPPORT
+	help
+	  Allow High-Speed capable device to operate at High-Speed. Disable this
+	  option to force Full-Speed only operation.
 
 config UDC_BUF_COUNT
 	int "Number of buffers in the pool"
diff --git a/subsys/usb/device_next/Kconfig b/subsys/usb/device_next/Kconfig
index ce51d5e9077..68ae7559845 100644
--- a/subsys/usb/device_next/Kconfig
+++ b/subsys/usb/device_next/Kconfig
@@ -24,10 +24,10 @@ choice USBD_MAX_SPEED_CHOICE
 config USBD_MAX_SPEED_HIGH
 	bool "High-Speed"
 	depends on UDC_DRIVER_HAS_HIGH_SPEED_SUPPORT
-	select UDC_DRIVER_HIGH_SPEED_SUPPORT_ENABLED
 
 config USBD_MAX_SPEED_FULL
 	bool "Full-Speed"
+	depends on !UDC_DRIVER_HIGH_SPEED_SUPPORT_ENABLED
 
 endchoice