diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index a140ff9..4532d72 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -49,11 +49,10 @@ on fs
     wait /dev/block/platform/soc/${ro.boot.bootdevice}
     symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice
 
-    mount_all /vendor/etc/fstab.qcom --early
-    write /proc/sys/vm/swappiness 100
-
     # Start HW service manager early
     start hwservicemanager
+    mount_all /vendor/etc/fstab.qcom --early
+    write /proc/sys/vm/swappiness 100
 
 on late-fs
     # Start services for bootanim
@@ -63,6 +62,11 @@ on late-fs
     start configstore-hal-1-0
     start gralloc-2-0
 
+    # Wait for hwservicemanager ready since fsck might be triggered in mount_all --late
+    # In such case, init won't responce the property_set from hwservicemanager and then
+    # cause services for bootanim not running.
+    wait_for_prop hwservicemanager.ready true
+
     # mount RW partitions which need run fsck
     mount_all /vendor/etc/fstab.qcom --late