diff --git a/factory_common.mk b/factory_common.mk
index b17ad95d..4fa3f93d 100644
--- a/factory_common.mk
+++ b/factory_common.mk
@@ -65,6 +65,11 @@ PRODUCT_PACKAGES += \
         FactoryOverlayLauncher3 \
         FactoryOverlayFrameworkRes
 
+# To prevent rebooting due to crashing services
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+    init.svc_debug.no_fatal.zygote=true \
+    persist.device_config.configuration.disable_rescue_party=true
+
 # PixelLogger for RF testing
 PRODUCT_PACKAGES_DEBUG += \
     PixelLogger \