diff --git a/firmware/os/platform/stm32/i2c.c b/firmware/os/platform/stm32/i2c.c
index 7ba7b7c..8ae35cf 100644
--- a/firmware/os/platform/stm32/i2c.c
+++ b/firmware/os/platform/stm32/i2c.c
@@ -543,14 +543,16 @@
 
     state->tx.offset = state->tx.size - bytesLeft;
     state->tx.size = 0;
+
     stmI2cDmaDisable(pdev);
+
+    while (!(regs->SR1 & I2C_SR1_BTF))
+            ;
+
     if (err == 0 && state->rx.size > 0) {
         atomicWriteByte(&state->masterState, STM_I2C_MASTER_START);
         stmI2cStartEnable(pdev);
     } else {
-        while (!(regs->SR1 & I2C_SR1_BTF))
-            ;
-
         stmI2cStopEnable(pdev);
         stmI2cMasterTxRxDone(pdev, err);
     }