diff --git a/libraries/AP_HAL_ChibiOS/HAL_ChibiOS_Class.cpp b/libraries/AP_HAL_ChibiOS/HAL_ChibiOS_Class.cpp
index 57ac2b410b..42b7f9adf1 100644
--- a/libraries/AP_HAL_ChibiOS/HAL_ChibiOS_Class.cpp
+++ b/libraries/AP_HAL_ChibiOS/HAL_ChibiOS_Class.cpp
@@ -112,8 +112,6 @@ static ChibiOS::CANIface* canDrivers[HAL_NUM_CAN_IFACES];
 
 #if HAL_USE_WSPI == TRUE && defined(HAL_QSPI_DEVICE_LIST)
 static ChibiOS::QSPIDeviceManager qspiDeviceManager;
-#else
-static Empty::QSPIDeviceManager qspiDeviceManager;
 #endif
 
 #if HAL_WITH_IO_MCU
@@ -135,7 +133,11 @@ HAL_ChibiOS::HAL_ChibiOS() :
         &uartIDriver,
         &i2cDeviceManager,
         &spiDeviceManager,
+#if HAL_USE_WSPI == TRUE && defined(HAL_QSPI_DEVICE_LIST)
         &qspiDeviceManager,
+#else
+        nullptr,
+#endif
         &analogIn,
         &storageDriver,
         &uartADriver,