diff --git a/conf/init.efs.16k.rc b/conf/init.efs.16k.rc
index c3434bfd..72ae9894 100644
--- a/conf/init.efs.16k.rc
+++ b/conf/init.efs.16k.rc
@@ -11,9 +11,6 @@ on post-fs-data && property:ro.boot.flash.locked=0 && property:ro.fstype.data=ex
     restorecon_recursive /data/vendor/copied
     exec_start copy_efs_files_to_data
     mount_all /vendor/etc/fstab.efs.from_data
-    restorecon_recursive /mnt/vendor/efs
-    restorecon_recursive /mnt/vendor/efs_backup
-    restorecon_recursive /mnt/vendor/modem_userdata
     restorecon_recursive /mnt/vendor/persist
     restorecon_recursive /data/vendor/ss
     setprop ro.vendor.persist.status mounted
diff --git a/conf/init.persist.rc b/conf/init.persist.rc
index 26a9c4d7..7852c78e 100644
--- a/conf/init.persist.rc
+++ b/conf/init.persist.rc
@@ -1,4 +1,12 @@
 on property:ro.vendor.persist.status=mounted
+    # for modem related functions
+    restorecon_recursive /mnt/vendor/efs
+    chown radio system /mnt/vendor/efs
+    restorecon_recursive /mnt/vendor/efs_backup
+    chown radio system /mnt/vendor/efs_backup
+    restorecon_recursive /mnt/vendor/modem_userdata
+    chown radio system /mnt/vendor/modem_userdata
+
     # for battery defender
     mkdir /mnt/vendor/persist/battery 0700 system system
 
diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index f98001b3..f0cbf01c 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -605,12 +605,6 @@ on property:persist.vendor.radio.no_modem_board=1
 
 on fs
     mount_all --early
-    restorecon_recursive /mnt/vendor/efs
-    chown radio system /mnt/vendor/efs
-    restorecon_recursive /mnt/vendor/efs_backup
-    chown radio system /mnt/vendor/efs_backup
-    restorecon_recursive /mnt/vendor/modem_userdata
-    chown radio system /mnt/vendor/modem_userdata
 
     # Mount modem partition
     mount_all /vendor/etc/fstab.modem --early