diff --git a/etc/init.qti.usb.debug.rc b/etc/init.qti.usb.debug.rc
index f0c3602..7876362 100644
--- a/etc/init.qti.usb.debug.rc
+++ b/etc/init.qti.usb.debug.rc
@@ -26,5 +26,5 @@
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-on init && property:ro.build.type=userdebug
+on init
     exec u:r:vendor-qti-testscripts:s0 -- /vendor/bin/sh /vendor/bin/init.qti.usb.debug.sh
diff --git a/etc/init.qti.usb.debug.sh b/etc/init.qti.usb.debug.sh
index 97565fa..203679d 100644
--- a/etc/init.qti.usb.debug.sh
+++ b/etc/init.qti.usb.debug.sh
@@ -27,7 +27,12 @@
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-# Enable various ftrace debugging events
+# bail out if its perf config
+if [ ! -d /sys/module/msm_rtb ]; then
+    return
+fi
+
+# Enable various ftrace debugging events for USB
 tracefs=/sys/kernel/tracing
 
 if [ -d $tracefs ]; then