diff --git a/source/Core/BSP/Miniware/I2C_Wrapper.cpp b/source/Core/BSP/Miniware/I2C_Wrapper.cpp
index 47150ab5..b173c374 100644
--- a/source/Core/BSP/Miniware/I2C_Wrapper.cpp
+++ b/source/Core/BSP/Miniware/I2C_Wrapper.cpp
@@ -42,14 +42,12 @@ bool FRToSI2C::Mem_Write(uint16_t DevAddress, uint16_t MemAddress, uint8_t *pDat
 
   if (!lock())
     return false;
-  if (HAL_I2C_Mem_Write(&hi2c1, DevAddress, MemAddress, I2C_MEMADD_SIZE_8BIT, pData, Size, 500) != HAL_OK) {
+  if (HAL_I2C_Mem_Write_IT(&hi2c1, DevAddress, MemAddress, I2C_MEMADD_SIZE_8BIT, pData, Size) != HAL_OK) {
 
     I2C_Unstick();
     unlock();
     return false;
   }
-
-  unlock();
   return true;
 }