diff --git a/config/evolution.mk b/config/evolution.mk
index f76ba3a7..68f670d3 100644
--- a/config/evolution.mk
+++ b/config/evolution.mk
@@ -80,12 +80,20 @@ else
 -include vendor/evolution-priv/keys/keys.mk
 endif
 
+# PERF_ANIM_OVERRIDE
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.sys.activity_anim_perf_override=$(PERF_ANIM_OVERRIDE)
+
+ifeq ($(PERF_ANIM_OVERRIDE),true)
+PRODUCT_PRODUCT_PROPERTIES += \
+    debug.sf.predict_hwc_composition_strategy=0
+endif
+
 # Other ROM feature flags
 BYPASS_CHARGE_SUPPORTED ?= false
 PERF_ANIM_OVERRIDE ?= false
 TORCH_STR_SUPPORTED ?= true
 
 PRODUCT_SYSTEM_PROPERTIES += \
-    persist.sys.activity_anim_perf_override=$(PERF_ANIM_OVERRIDE)
     persist.sys.battery_bypass_supported=$(BYPASS_CHARGE_SUPPORTED) \
     persist.sys.torch_str_support=$(TORCH_STR_SUPPORTED)