diff --git a/device.mk b/device.mk
index 7a9d129d..729ee69d 100644
--- a/device.mk
+++ b/device.mk
@@ -1135,3 +1135,6 @@ PRODUCT_COPY_FILES += \
 # Use 64-bit dex2oat for better dexopt time.
 PRODUCT_PROPERTY_OVERRIDES += \
     dalvik.vm.dex2oat64.enabled=true
+
+# Call deleteAllKeys if vold detects a factory reset
+PRODUCT_VENDOR_PROPERTIES += ro.crypto.metadata_init_delete_all_keys.enabled=true