diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 6c658001..bdc832c9 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -22,6 +22,8 @@ endif
 # APEX image
 ifeq ($(ENABLE_APEX), true)
 DEXPREOPT_GENERATE_APEX_IMAGE := true
+else
+OVERRIDE_TARGET_FLATTEN_APEX := true
 endif
 
 # ANT+
diff --git a/sdm660.mk b/sdm660.mk
index e903941a..8569a181 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -20,6 +20,8 @@ ifeq ($(ENABLE_APEX), true)
 TARGET_SUPPORTS_UPDATABLE_APEX := true
 $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
 $(call inherit-product-if-exists, vendor/prebuilts/config/apex.mk)
+else
+PRODUCT_PRODUCT_PROPERTIES += ro.apex.updatable=false
 endif
 
 # Inherit proprietary files