diff --git a/proprietary/vendor/app/TimeService/TimeService.apk b/proprietary/vendor/app/TimeService/TimeService.apk
index 7940791..920c63f 100644
Binary files a/proprietary/vendor/app/TimeService/TimeService.apk and b/proprietary/vendor/app/TimeService/TimeService.apk differ
diff --git a/proprietary/vendor/bin/time_daemon b/proprietary/vendor/bin/time_daemon
index 2e234d5..8a108f2 100755
Binary files a/proprietary/vendor/bin/time_daemon and b/proprietary/vendor/bin/time_daemon differ
diff --git a/proprietary/vendor/etc/init/init.time_daemon.rc b/proprietary/vendor/etc/init/init.time_daemon.rc
index 046860a..7d81585 100644
--- a/proprietary/vendor/etc/init/init.time_daemon.rc
+++ b/proprietary/vendor/etc/init/init.time_daemon.rc
@@ -4,6 +4,9 @@
 # Confidential and Proprietary - Qualcomm Technologies, Inc.
 #
 
+on post-fs-data && property:ro.crypto.state=encrypted && property:ro.crypto.type=file
+    start time_daemon
+
 service time_daemon /vendor/bin/time_daemon
     class main
     user system