diff --git a/vendor_prop.mk b/vendor_prop.mk
index a116e3a..880e396 100644
--- a/vendor_prop.mk
+++ b/vendor_prop.mk
@@ -289,4 +289,5 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Boot
 PRODUCT_PROPERTY_OVERRIDES += \
-    sys.vendor.shutdown.waittime=500
+    sys.vendor.shutdown.waittime=500 \
+    ro.build.shutdown_timeout=0