diff --git a/core/main.mk b/core/main.mk
index 878346128..e7f97f078 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -230,7 +230,8 @@ ifeq ($(TARGET_BUILD_VARIANT),eng)
 tags_to_install := user debug eng
   # Don't require the setup wizard on eng builds
   ADDITIONAL_BUILD_PROPERTIES := $(filter-out ro.setupwizard.mode=%,\
-          $(call collapse-pairs, $(ADDITIONAL_BUILD_PROPERTIES)))
+          $(call collapse-pairs, $(ADDITIONAL_BUILD_PROPERTIES))) \
+          ro.setupwizard.mode=OPTIONAL
 endif
 
 ## tests ##