diff --git a/bt-commonsys-intf-board.mk b/bt-commonsys-intf-board.mk
index 43d7dd1..df2694d 100644
--- a/bt-commonsys-intf-board.mk
+++ b/bt-commonsys-intf-board.mk
@@ -12,3 +12,12 @@
 TARGET_USE_QTI_BT_CONFIGSTORE := true
 TARGET_USE_QTI_BT_SAR := true
 TARGET_USE_QTI_VND_FWK_DETECT := true
+
+ifeq ($(TARGET_USES_QMAA),true)
+ifneq ($(TARGET_USES_QMAA_OVERRIDE_BLUETOOTH),true)
+BOARD_HAVE_BLUETOOTH_QCOM := false
+endif
+ifneq ($(TARGET_USES_QMAA_OVERRIDE_FM),true)
+BOARD_HAVE_QCOM_FM := false
+endif
+endif