diff --git a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-early-sys-init b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-early-sys-init
index dafaa18..ec8ed1f 100644
--- a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-early-sys-init
+++ b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-early-sys-init
@@ -2,6 +2,15 @@
 # shellcheck source=meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions
 source /usr/libexec/yosemite4-common-functions
 
+
+enable_all_fan_input()
+{
+    for file in /sys/bus/i2c/devices/*/hwmon/*/fan*_enable
+    do
+      echo 1 > "${file}"
+    done
+}
+
 # probe devices behind mux for management board cpld
 
 rev_id_gpiochip=$(basename "/sys/bus/i2c/devices/13-0020/"*gpiochip*)
@@ -41,4 +50,7 @@
 chown root:kmem /dev/mem
 devmem 0x1e78008c 32 0x19000000
 
+# Enable all fan input as early as possible
+enable_all_fan_input
+
 exit 0
diff --git a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-sys-init.service b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-sys-init.service
index d2377f4..627a2d8 100644
--- a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-sys-init.service
+++ b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-sys-init.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Yosemite4 Early System Init
 Before=phosphor-pid-control.service
+Before=xyz.openbmc_project.fansensor.service
 
 [Service]
 Type=oneshot