diff --git a/device-common.mk b/device-common.mk
index 11968a03..e18dd358 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -113,3 +113,9 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
         persist.vendor.tcpdump.log.alwayson=false \
         persist.vendor.tcpdump.log.br_num=5
 endif
+
+# Disable Rescue Party on userdebug & eng build
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.sys.disable_rescue=true
+endif
diff --git a/product.prop b/product.prop
index b3c80715..93775922 100644
--- a/product.prop
+++ b/product.prop
@@ -93,9 +93,6 @@ ro.netflix.bsp_rev=Q6150-17263-1
 persist.data.netmgrd.qos.enable=true
 persist.data.mode=concurrent
 
-# Disable RescueParty / rescue mode
-persist.sys.disable_rescue=true
-
 # System props to enable Bluetooth Quality Report (BQR) feature
 # BQR event mask configuration
 persist.bluetooth.bqr.event_mask=14