diff --git a/src/arch/xtensa/configs/baytrail_defconfig b/src/arch/xtensa/configs/baytrail_defconfig
index 24a88094a978..433ac3e103ea 100644
--- a/src/arch/xtensa/configs/baytrail_defconfig
+++ b/src/arch/xtensa/configs/baytrail_defconfig
@@ -1,2 +1,4 @@
 CONFIG_BAYTRAIL=y
 CONFIG_COMP_TEST_KEYPHRASE=n
+CONFIG_COMP_KPB=n
+CONFIG_COMP_SEL=n
diff --git a/src/arch/xtensa/configs/cherrytrail_defconfig b/src/arch/xtensa/configs/cherrytrail_defconfig
index c39adfd1b01d..38106adfbb60 100644
--- a/src/arch/xtensa/configs/cherrytrail_defconfig
+++ b/src/arch/xtensa/configs/cherrytrail_defconfig
@@ -1,2 +1,4 @@
 CONFIG_CHERRYTRAIL=y
 CONFIG_COMP_TEST_KEYPHRASE=n
+CONFIG_COMP_KPB=n
+CONFIG_COMP_SEL=n