diff --git a/src/atsam/Kconfig b/src/atsam/Kconfig
index 4e2e839e..aa802072 100644
--- a/src/atsam/Kconfig
+++ b/src/atsam/Kconfig
@@ -14,6 +14,7 @@ config ATSAM_SELECT
     select HAVE_STRICT_TIMING
     select HAVE_CHIPID
     select HAVE_STEPPER_BOTH_EDGE
+    select HAVE_BOOTLOADER_REQUEST
 
 config BOARD_DIRECTORY
     string
diff --git a/src/atsamd/Kconfig b/src/atsamd/Kconfig
index d6643ffd..05e4c50e 100644
--- a/src/atsamd/Kconfig
+++ b/src/atsamd/Kconfig
@@ -14,6 +14,7 @@ config ATSAMD_SELECT
     select HAVE_STRICT_TIMING
     select HAVE_CHIPID
     select HAVE_STEPPER_BOTH_EDGE
+    select HAVE_BOOTLOADER_REQUEST
 
 config HAVE_SERCOM
     depends on HAVE_GPIO_I2C || HAVE_GPIO_SPI
diff --git a/src/generic/usb_cdc.c b/src/generic/usb_cdc.c
index 40ff74ba..143c213f 100644
--- a/src/generic/usb_cdc.c
+++ b/src/generic/usb_cdc.c
@@ -446,6 +446,8 @@ static uint8_t line_control_state;
 static void
 check_reboot(void)
 {
+    if (!CONFIG_HAVE_BOOTLOADER_REQUEST)
+        return;
     if (line_coding.dwDTERate == 1200 && !(line_control_state & 0x01))
         // A baud of 1200 is an Arduino style request to enter the bootloader
         bootloader_request();
diff --git a/src/rp2040/Kconfig b/src/rp2040/Kconfig
index 904699f8..ba6f00f8 100644
--- a/src/rp2040/Kconfig
+++ b/src/rp2040/Kconfig
@@ -14,6 +14,7 @@ config RP2040_SELECT
     select HAVE_CHIPID
     select HAVE_GPIO_HARD_PWM
     select HAVE_STEPPER_BOTH_EDGE
+    select HAVE_BOOTLOADER_REQUEST
 
 config BOARD_DIRECTORY
     string