diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc
index 2ad44da..a25939e 100644
--- a/rootdir/init.qcom.rc
+++ b/rootdir/init.qcom.rc
@@ -403,3 +403,9 @@ service time_daemon /vendor/bin/time_daemon
     class main
     user root
     group root
+
+on property:init.svc.media=restarting
+    restart qcamerasvr
+
+on property:init.svc.servicemanager=restarting
+    restart qcamerasvr
diff --git a/rootdir/init.target.rc b/rootdir/init.target.rc
index 5676552..7eb54fb 100644
--- a/rootdir/init.target.rc
+++ b/rootdir/init.target.rc
@@ -50,7 +50,7 @@ on post-fs-data
 
 # Start camera server as daemon
 service qcamerasvr /vendor/bin/mm-qcamera-daemon
-    class late_start
+    class main
     user camera
     group camera system inet input graphics
     writepid /dev/cpuset/system-background/tasks