diff --git a/arch/arm/src/stm32f7/stm32_i2c.c b/arch/arm/src/stm32f7/stm32_i2c.c
index 51a9f31b55..da86f7318f 100644
--- a/arch/arm/src/stm32f7/stm32_i2c.c
+++ b/arch/arm/src/stm32f7/stm32_i2c.c
@@ -1464,7 +1464,9 @@ static inline void stm32_i2c_sendstart(FAR struct stm32_i2c_priv_s *priv)
    * it otherwise.
    */
 
-  if (priv->msgc > 0)
+  /* Check if there are multiple messages and the next is a continuation */
+
+  if (priv->msgc > 1)
     {
       next_norestart = (((priv->msgv + 1)->flags & I2C_M_NOSTART) != 0);
     }