diff --git a/rootdir/etc/init.mmi.rc b/rootdir/etc/init.mmi.rc
index c89a8fe..927c51c 100644
--- a/rootdir/etc/init.mmi.rc
+++ b/rootdir/etc/init.mmi.rc
@@ -235,6 +235,18 @@ on charger
     trigger early-fs
     trigger fs
     trigger post-fs
+
+    ## Fold important parts of late-fs into `on charger` to prevent
+    ## starting bootanimation in charge_only_mode
+
+    # Ensure that tracefs has the correct permissions.
+    # This does not work correctly if it is called in post-fs.
+    chmod 0755 /sys/kernel/tracing
+    chmod 0755 /sys/kernel/debug/tracing
+
+    # HALs required before storage encryption can get unlocked (FBE/FDE)
+    class_start early_hal
+
     trigger post-fs-data
     trigger moto-charger
     class_stop main