diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index d1dac4b..8b3400b 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -24,9 +24,6 @@ TARGET_2ND_CPU_ABI2 := armeabi
 TARGET_2ND_CPU_VARIANT := generic
 TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a53
 
-# Audio
-TARGET_EXCLUDES_AUDIOFX := true
-
 # Build system
 BUILD_BROKEN_DUP_RULES := true
 
diff --git a/universal7904-common.mk b/universal7904-common.mk
index e781154..1948568 100644
--- a/universal7904-common.mk
+++ b/universal7904-common.mk
@@ -6,6 +6,8 @@ PRODUCT_AAPT_CONFIG := normal
 PRODUCT_AAPT_PREF_CONFIG := xxhdpi
 
 # Audio
+TARGET_EXCLUDES_AUDIOFX := true
+
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/audio_policy_configuration.xml:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/29/etc/audio_policy_configuration.xml