diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 7715295..25ec78d 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -60,7 +60,6 @@ TARGET_BOARD_PLATFORM_GPU := qcom-adreno630
 
 # Properties
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
-PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
 
 # Treble
 BOARD_VNDK_VERSION := current
diff --git a/common.mk b/common.mk
index 42fea6b..ccc1853 100644
--- a/common.mk
+++ b/common.mk
@@ -25,6 +25,8 @@ DEVICE_PACKAGE_OVERLAYS += \
 # Properties
 -include $(LOCAL_PATH)/system_prop.mk
 
+PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
+
 # A/B
 AB_OTA_UPDATER := true