diff --git a/base.mk b/base.mk
index 73abbab..7020df2 100644
--- a/base.mk
+++ b/base.mk
@@ -201,6 +201,7 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 	debug.fdsan=warn_once \
 	ro.apex.updatable=false \
 	persist.sys.fflag.override.settings_provider_model=false \
+	ro.setupwizard.mode=OPTIONAL \
 
 # AOSP overlays
 PRODUCT_PACKAGES += \