diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 98a0c7ba..57c08f26 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -181,7 +181,6 @@ ifeq ($(HOST_OS),linux)
     endif
   endif
 endif
-PRODUCT_DEXPREOPT_SPEED_APPS += SystemUI
 
 # EXFAT
 TARGET_EXFAT_DRIVER := sdfat
diff --git a/sdm660.mk b/sdm660.mk
index 1272bca7..67c0e834 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -334,6 +334,9 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.power@1.1-service-qti
 
+# Preopt SystemUI
+PRODUCT_DEXPREOPT_SPEED_APPS += SystemUI
+
 # Public Libraries
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/configs/public.libraries.txt:$(TARGET_COPY_OUT_VENDOR)/etc/public.libraries.txt