diff --git a/conf/init.tangorpro.rc b/conf/init.tangorpro.rc
index 4e5535c..8d02002 100644
--- a/conf/init.tangorpro.rc
+++ b/conf/init.tangorpro.rc
@@ -82,13 +82,13 @@ on post-fs-data
     chown system system /sys/devices/platform/odm/odm:fp_fpc1020/irq
     chown system system /sys/devices/platform/odm/odm:fp_fpc1020/wakeup_enable
 
-on fs
+on property:ro.vendor.trusty.storage.fs_ready=1
     exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/1540.app
 # Permissions for hwcomposer
     chown system system /sys/class/backlight/panel0-backlight/cabc_mode
 
 # Castauth
-on post-fs-data
+on property:ro.vendor.trusty.storage.fs_ready=1
     exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/cast_auth.app
 
 # Wifi