diff --git a/src/PinMapping.cpp b/src/PinMapping.cpp
index 9fab3332..1e19e7c5 100644
--- a/src/PinMapping.cpp
+++ b/src/PinMapping.cpp
@@ -7,6 +7,7 @@
 #include "Utils.h"
 #include <ArduinoJson.h>
 #include <LittleFS.h>
+#include <SpiManager.h>
 #include <string.h>
 
 #ifndef DISPLAY_TYPE
@@ -194,6 +195,13 @@ PinMapping_t& PinMappingClass::get()
 
 bool PinMappingClass::init(const String& deviceMapping)
 {
+
+    // Initialize SpiManager
+    SpiManagerInst.register_bus(SPI2_HOST);
+#if SOC_SPI_PERIPH_NUM > 2
+    SpiManagerInst.register_bus(SPI3_HOST);
+#endif
+
     File f = LittleFS.open(PINMAPPING_FILENAME, "r", false);
 
     if (!f) {
diff --git a/src/main.cpp b/src/main.cpp
index a5ef340c..e2dee42e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,7 +25,6 @@
 #include "defaults.h"
 #include <Arduino.h>
 #include <LittleFS.h>
-#include <SpiManager.h>
 #include <TaskScheduler.h>
 #include <esp_heap_caps.h>
 
@@ -34,12 +33,6 @@ void setup()
     // Move all dynamic allocations >512byte to psram (if available)
     heap_caps_malloc_extmem_enable(512);
 
-    // Initialize SpiManager
-    SpiManagerInst.register_bus(SPI2_HOST);
-#if SOC_SPI_PERIPH_NUM > 2
-    SpiManagerInst.register_bus(SPI3_HOST);
-#endif
-
     // Initialize serial output
     Serial.begin(SERIAL_BAUDRATE);
 #if !ARDUINO_USB_CDC_ON_BOOT