diff --git a/init.hardware.diag.rc.user b/init.hardware.diag.rc.user
index 85a64e01..769c7cc9 100644
--- a/init.hardware.diag.rc.user
+++ b/init.hardware.diag.rc.user
@@ -36,7 +36,7 @@ service diag_mdlog_stop /vendor/bin/diag_mdlog -k
     disabled
     oneshot
 
-on boot && property:persist.vendor.sys.modem.diag.mdlog=*
+on property:persist.vendor.sys.modem.diag.mdlog=*
     rm /data/vendor/radio/diag_logs/diag_mdlog_pid
     setprop vendor.sys.modem.diag.mdlog ${persist.vendor.sys.modem.diag.mdlog}
 
diff --git a/init.hardware.diag.rc.userdebug b/init.hardware.diag.rc.userdebug
index f675f243..f4b52285 100644
--- a/init.hardware.diag.rc.userdebug
+++ b/init.hardware.diag.rc.userdebug
@@ -45,7 +45,7 @@ on boot && property:persist.vendor.sys.modem.diag.mdlog=*
     rm /data/vendor/radio/diag_logs/diag_mdlog_pid
     setprop vendor.sys.modem.diag.mdlog ${persist.vendor.sys.modem.diag.mdlog}
 
-on property:vendor.sys.modem.diag.mdlog=true
+on property:vendor.sys.modem.diag.mdlog=true && property:persist.vendor.verbose_logging_enabled=true
     start diag_mdlog_start
 
 on property:vendor.sys.modem.diag.mdlog=false
@@ -106,6 +106,3 @@ on property:persist.bluetooth.btsnoopenable=false
 
 on property:vendor.usb.config=*
    start usbd
-
-on property:persist.vendor.verbose_logging_enabled=*
-   setprop persist.vendor.sys.modem.diag.mdlog ${persist.vendor.verbose_logging_enabled}