diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/cybsp_serial_flash_prog.c b/targets/TARGET_Cypress/TARGET_PSOC6/common/cybsp_serial_flash_prog.c
index 1948adcd61..c0306dc6fb 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/common/cybsp_serial_flash_prog.c
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/common/cybsp_serial_flash_prog.c
@@ -41,7 +41,7 @@
 extern "C" {
 #endif
 
-#if defined(CYBSP_QSPI_SCK)
+#if defined(CYBSP_QSPI_SCK) && (DEVICE_QSPI)
 #include "cycfg_qspi_memslot.h"
 
 typedef struct
@@ -85,7 +85,7 @@ const uint32_t cyToc[128] =
 };
 
 /** \} group_bsp_serial_flash_variables */
-#endif /* defined(CYBSP_QSPI_SCK) */
+#endif /* defined(CYBSP_QSPI_SCK) && (DEVICE_QSPI) */
 
 #if defined(__cplusplus)
 }
diff --git a/targets/targets.json b/targets/targets.json
index eca61fd47c..9e3d854e2e 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -8703,6 +8703,8 @@
     },
     "CY8CPROTO_064_SB": {
         "inherits": ["MCU_PSOC6_M4"],
+        "components_remove": ["QSPIF"],
+        "device_has_remove": ["QSPI"],
         "supported_form_factors": ["ARDUINO"],
         "extra_labels_add": ["PSOC6_01"],
         "macros_add": ["CYB06447BZI_D54",