diff --git a/src/main/drivers/bus_spi_config.c b/src/main/drivers/bus_spi_config.c
index f341807e4e..05968c7dd6 100644
--- a/src/main/drivers/bus_spi_config.c
+++ b/src/main/drivers/bus_spi_config.c
@@ -39,8 +39,6 @@
 #include "pg/rx_spi.h"
 #include "pg/sdcard.h"
 
-#include "sensors/initialisation.h"
-
 typedef struct spiPreinit_s {
     ioTag_t iotag;
     uint8_t iocfg;
@@ -81,8 +79,6 @@ static void spiPreinitPin(spiPreinit_t *preinit, int index)
 
 void spiPreinit(void)
 {
-    sensorsPreInit();
-
 #ifdef USE_SDCARD_SPI
     sdcard_preInit(sdcardConfig());
 #endif
diff --git a/src/main/fc/init.c b/src/main/fc/init.c
index 186dc68654..b0a66e6707 100644
--- a/src/main/fc/init.c
+++ b/src/main/fc/init.c
@@ -422,7 +422,11 @@ void init(void)
 
 #ifdef USE_SPI
     spiPinConfigure(spiPinConfig(0));
+#endif
 
+    sensorsPreInit();
+
+#ifdef USE_SPI
     spiPreinit();
 
 #ifdef USE_SPI_DEVICE_1
diff --git a/src/main/target/ALIENFLIGHTF3/initialisation.c b/src/main/target/ALIENFLIGHTF3/initialisation.c
index 729cee23e9..99e254d17e 100644
--- a/src/main/target/ALIENFLIGHTF3/initialisation.c
+++ b/src/main/target/ALIENFLIGHTF3/initialisation.c
@@ -22,18 +22,25 @@
 #include <stdint.h>
 
 #include "platform.h"
+
 #include "drivers/bus.h"
 #include "drivers/bus_i2c.h"
 #include "drivers/bus_spi.h"
-#include "io/serial.h"
+
 #include "hardware_revision.h"
+
+#include "io/serial.h"
+
 #include "pg/bus_i2c.h"
 #include "pg/bus_spi.h"
 
+#include "sensors/initialisation.h"
+
 void targetBusInit(void)
 {
     if (hardwareRevision == AFF3_REV_2) {
         spiPinConfigure(spiPinConfig(0));
+        sensorsPreInit();
         spiPreinit();
         spiInit(SPIDEV_3);
     }
diff --git a/src/main/target/CJMCU/initialisation.c b/src/main/target/CJMCU/initialisation.c
index 2b55764bc8..091772c589 100644
--- a/src/main/target/CJMCU/initialisation.c
+++ b/src/main/target/CJMCU/initialisation.c
@@ -22,17 +22,23 @@
 #include <stdint.h>
 
 #include "platform.h"
+
 #include "drivers/bus.h"
 #include "drivers/bus_i2c.h"
 #include "drivers/bus_spi.h"
+
 #include "io/serial.h"
+
 #include "pg/bus_i2c.h"
 #include "pg/bus_spi.h"
 
+#include "sensors/initialisation.h"
+
 void targetBusInit(void)
 {
 #if defined(USE_SPI) && defined(USE_SPI_DEVICE_1)
     spiPinConfigure(spiPinConfig(0));
+    sensorsPreInit();
     spiPreinit();
     spiInit(SPIDEV_1);
 #endif
diff --git a/src/main/target/NAZE/initialisation.c b/src/main/target/NAZE/initialisation.c
index 9cbccd6a2a..57cc3f0c4c 100644
--- a/src/main/target/NAZE/initialisation.c
+++ b/src/main/target/NAZE/initialisation.c
@@ -22,18 +22,25 @@
 #include <stdint.h>
 
 #include "platform.h"
+
 #include "drivers/bus.h"
 #include "drivers/bus_i2c.h"
 #include "drivers/bus_spi.h"
-#include "io/serial.h"
+
 #include "hardware_revision.h"
+
+#include "io/serial.h"
+
 #include "pg/bus_i2c.h"
 #include "pg/bus_spi.h"
 
+#include "sensors/initialisation.h"
+
 void targetBusInit(void)
 {
 #ifdef USE_SPI
     spiPinConfigure(spiPinConfig(0));
+    sensorsPreInit();
     spiPreinit();
 #ifdef USE_SPI_DEVICE_2
     spiInit(SPIDEV_2);