diff --git a/src/main/drivers/bus_spi.c b/src/main/drivers/bus_spi.c
index 61f441ac75..9def6956e2 100644
--- a/src/main/drivers/bus_spi.c
+++ b/src/main/drivers/bus_spi.c
@@ -249,6 +249,8 @@ bool spiTransfer(SPI_TypeDef *instance, const uint8_t *txData, uint8_t *rxData,
     return true;
 }
 
+#include "build/debug.h"
+
 bool spiBusTransfer(const busDevice_t *bus, const uint8_t *txData, uint8_t *rxData, int length)
 {
     IOLo(bus->busdev_u.spi.csnPin);
@@ -259,13 +261,22 @@ bool spiBusTransfer(const busDevice_t *bus, const uint8_t *txData, uint8_t *rxDa
 
 void spiSetDivisor(SPI_TypeDef *instance, uint16_t divisor)
 {
-#define BR_CLEAR_MASK 0xFFC7
+#define BR_BITS ((BIT(5) | BIT(4) | BIT(3)))
+
+    // SPI2 and SPI3 are always on APB1/AHB1 which PCLK is half that of APB2/AHB2.
+
+    if (instance == SPI2 || instance == SPI3) {
+        divisor /= 2; // Safe for divisor == 0 or 1
+    }
+
     SPI_Cmd(instance, DISABLE);
 
-    const uint16_t tempRegister = (instance->CR1 & BR_CLEAR_MASK);
+    const uint16_t tempRegister = (instance->CR1 & ~BR_BITS);
     instance->CR1 = (tempRegister | ((ffs(divisor | 0x100) - 2) << 3));
 
     SPI_Cmd(instance, ENABLE);
+
+#undef BR_BITS
 }
 
 uint16_t spiGetErrorCounter(SPI_TypeDef *instance)
diff --git a/src/main/drivers/bus_spi_ll.c b/src/main/drivers/bus_spi_ll.c
index d7caf0911f..24abef5a91 100644
--- a/src/main/drivers/bus_spi_ll.c
+++ b/src/main/drivers/bus_spi_ll.c
@@ -302,13 +302,14 @@ bool spiBusTransfer(const busDevice_t *bus, const uint8_t *txData, uint8_t *rxDa
 
 void spiSetDivisor(SPI_TypeDef *instance, uint16_t divisor)
 {
+    // SPI2 and SPI3 are always on APB1/AHB1 which PCLK is half that of APB2/AHB2.
+
+    if (instance == SPI2 || instance == SPI3) {
+        divisor /= 2; // Safe for divisor == 0 or 1
+    }
+
     LL_SPI_Disable(instance);
-#define BR_CLEAR_MASK 0xFFC7
-
-    const uint16_t tempRegister = (instance->CR1 & BR_CLEAR_MASK);
-    instance->CR1 = (tempRegister | ((ffs(divisor | 0x100) - 2) << 3));
-
-    //LL_SPI_SetBaudRatePrescaler(instance, baudRatePrescaler);
+    LL_SPI_SetBaudRatePrescaler(instance, (ffs(divisor | 0x100) - 2) << SPI_CR1_BR_Pos);
     LL_SPI_Enable(instance);
 }