diff --git a/boards/esp32c3.json b/boards/esp32c3.json
index 762172fc3..8e1dae3d5 100644
--- a/boards/esp32c3.json
+++ b/boards/esp32c3.json
@@ -4,7 +4,7 @@
       "ldscript": "esp32c3_out.ld"
     },
     "core": "esp32",
-    "extra_flags": "-DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DESP32C3",
+    "extra_flags": "-DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DESP32C3",
     "f_cpu": "160000000L",
     "f_flash": "80000000L",
     "flash_mode": "dout",
diff --git a/boards/esp32s2.json b/boards/esp32s2.json
index e0736aa29..07c043b2f 100644
--- a/boards/esp32s2.json
+++ b/boards/esp32s2.json
@@ -4,7 +4,7 @@
       "ldscript": "esp32s2_out.ld"
     },
     "core": "esp32",
-    "extra_flags": "-DBOARD_HAS_PSRAM -DESP32_4M -DESP32S2",
+    "extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=0 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0 -DESP32_4M -DESP32S2",
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dout",
diff --git a/boards/esp32s3.json b/boards/esp32s3.json
index bb7c9afe6..78f03cced 100644
--- a/boards/esp32s3.json
+++ b/boards/esp32s3.json
@@ -5,7 +5,7 @@
       "memory_type": "qspi_qspi"
     },
     "core": "esp32",
-    "extra_flags": "-DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3",
+    "extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=0 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0 -DESP32_4M -DESP32S3",
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dio",
diff --git a/boards/esp32s3_8M.json b/boards/esp32s3_8M.json
index 5e09bf5a0..1996236c7 100644
--- a/boards/esp32s3_8M.json
+++ b/boards/esp32s3_8M.json
@@ -5,7 +5,7 @@
       "memory_type": "qspi_qspi"
     },
     "core": "esp32",
-    "extra_flags": "-DBOARD_HAS_PSRAM -DESP32_8M -DESP32S3",
+    "extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=0 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0 -DESP32_8M -DESP32S3",
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dio",