diff --git a/src/main/drivers/bus_spi.c b/src/main/drivers/bus_spi.c
index 5de25e0c520..82a92639912 100644
--- a/src/main/drivers/bus_spi.c
+++ b/src/main/drivers/bus_spi.c
@@ -717,7 +717,7 @@ void spiSequence(const extDevice_t *dev, busSegment_t *segments)
 {
     busDevice_t *bus = dev->bus;
 
-    ATOMIC_BLOCK(NVIC_PRIO_MAX) {
+    ATOMIC_BLOCK(NVIC_PRIO_SPI_DMA) {
         if (spiIsBusy(dev)) {
             busSegment_t *endSegment;
 
diff --git a/src/main/drivers/rx/rx_sx1280.c b/src/main/drivers/rx/rx_sx1280.c
index 34546b8dffb..b3f7ba988f3 100644
--- a/src/main/drivers/rx/rx_sx1280.c
+++ b/src/main/drivers/rx/rx_sx1280.c
@@ -572,7 +572,7 @@ static void sx1280StartTransmittingDMA(extiCallbackRec_t *cb);
 FAST_IRQ_HANDLER void sx1280ISR(void)
 {
     // Only attempt to access the SX1280 if it is currently idle to avoid any race condition
-    ATOMIC_BLOCK(NVIC_PRIO_MAX) {
+    ATOMIC_BLOCK(NVIC_PRIO_RX_INT_EXTI) {
         if (sx1280EnableBusy()) {
             pendingISR = false;
             sx1280SetBusyFn(sx1280IrqGetStatus);
diff --git a/src/main/pg/sdcard.c b/src/main/pg/sdcard.c
index c19b71ee81f..292203cb8f8 100644
--- a/src/main/pg/sdcard.c
+++ b/src/main/pg/sdcard.c
@@ -30,6 +30,7 @@
 
 #include "sdcard.h"
 #include "drivers/bus_spi.h"
+#include "drivers/sdio.h"
 #include "drivers/io.h"
 #include "drivers/dma.h"
 #include "drivers/dma_reqmap.h"
@@ -71,5 +72,11 @@ void pgResetFn_sdcardConfig(sdcardConfig_t *config)
         config->mode = SDCARD_MODE_SPI;
     }
 #endif
+
+#if defined(USE_SDCARD_SDIO)
+    if (SDIO_DEVICE != SDIOINVALID) {
+        config->mode = SDCARD_MODE_SDIO;
+    }
+#endif
 }
 #endif