diff --git a/packages/jelos/sources/autostart/daemons/005-fstrim b/packages/jelos/sources/autostart/daemons/005-fstrim
new file mode 100644
index 000000000..467458a44
--- /dev/null
+++ b/packages/jelos/sources/autostart/daemons/005-fstrim
@@ -0,0 +1,2 @@
+SVC="fstrim.timer"
+DAEMONS=("fstrim")
diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk
index cbdca2b3c..dc27e99db 100644
--- a/packages/sysutils/util-linux/package.mk
+++ b/packages/sysutils/util-linux/package.mk
@@ -92,5 +92,4 @@ post_install () {
   if [ "${SWAP_SUPPORT}" = "yes" ]; then
     enable_service swap.service
   fi
-  enable_service fstrim.timer
 }
diff --git a/packages/sysutils/util-linux/system.d/fstrim.service b/packages/sysutils/util-linux/system.d/fstrim.service
index f1096c24b..75bb63f8c 100644
--- a/packages/sysutils/util-linux/system.d/fstrim.service
+++ b/packages/sysutils/util-linux/system.d/fstrim.service
@@ -3,7 +3,5 @@ Description=Discard unused blocks on all filesystems
 
 [Service]
 Type=oneshot
-# don't run immediately on boot when timer event was missed
-ExecStartPre=-/usr/bin/sleep 20
 ExecStart=-/usr/sbin/fstrim --all --verbose --quiet-unsupported
 ExecStart=-/usr/bin/touch /storage/.cache/fstrim.run