diff --git a/lib/sdk/Libraries/MAX32665PeriphDriver/Source/i2c.c b/lib/sdk/Libraries/MAX32665PeriphDriver/Source/i2c.c
index 7dd5644a5a8d90058d3f5ebb75509e3af280062e..fef3e0293e970aa952cdde48283d2a035ef186c0 100644
--- a/lib/sdk/Libraries/MAX32665PeriphDriver/Source/i2c.c
+++ b/lib/sdk/Libraries/MAX32665PeriphDriver/Source/i2c.c
@@ -404,6 +404,7 @@ int I2C_MasterRead(mxc_i2c_regs_t *i2c, uint8_t addr, uint8_t* data, int len, in
         if (i2c->int_fl0 & I2C_ERROR) {
             // Set the stop bit
             i2c->master_ctrl |= MXC_F_I2C_MASTER_CTRL_STOP;
+            while (!(i2c->int_fl0 & (MXC_F_I2C_INT_FL0_STOP))) {}
             return E_COMM_ERR;
         }
 
@@ -416,6 +417,7 @@ int I2C_MasterRead(mxc_i2c_regs_t *i2c, uint8_t addr, uint8_t* data, int len, in
     if (i2c->int_fl0 & I2C_ERROR) {
         // Set the stop bit
         i2c->master_ctrl |= MXC_F_I2C_MASTER_CTRL_STOP;
+        while (!(i2c->int_fl0 & (MXC_F_I2C_INT_FL0_STOP))) {}
         return E_COMM_ERR;
     }