diff --git a/init.common.diag.rc.userdebug b/init.common.diag.rc.userdebug
index 140c6b58e..4bf2094bf 100644
--- a/init.common.diag.rc.userdebug
+++ b/init.common.diag.rc.userdebug
@@ -105,6 +105,12 @@ on property:persist.sys.cnss.diag_txt=true
 on property:persist.sys.cnss.diag_txt=false
     stop cnss_diag_txt
 
+service cnss_diag /vendor/bin/cnss_diag -q -u
+    class late_start
+    user system
+    group system
+    oneshot
+
 service cnss_diag_txt /vendor/bin/cnss_diag -s -f -m /data/cnss_diag/cnss_diag.conf
     class late_start
     user system
diff --git a/init.common.rc b/init.common.rc
index fdb508fdd..5a333f100 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -667,12 +667,6 @@ service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
     disabled
     oneshot
 
-service cnss_diag /vendor/bin/cnss_diag -q
-    class late_start
-    user system
-    group system
-    oneshot
-
 service cnss-daemon /vendor/bin/cnss-daemon -n -l
     class late_start
     user system