diff --git a/cores/arduino/stm32/twi.c b/cores/arduino/stm32/twi.c
index 9df7ebdccb..f7a61ed4fe 100644
--- a/cores/arduino/stm32/twi.c
+++ b/cores/arduino/stm32/twi.c
@@ -79,7 +79,7 @@ static I2C_HandleTypeDef *i2c_handles[I2C_NUM];
   */
 void i2c_init(i2c_t *obj)
 {
-  i2c_custom_init(obj, I2C_100KHz, I2C_ADDRESSINGMODE_7BIT, 0x33, 1);
+  i2c_custom_init(obj, I2C_100KHz, I2C_ADDRESSINGMODE_7BIT, 0x33);
 }
 
 /**
@@ -88,10 +88,9 @@ void i2c_init(i2c_t *obj)
   * @param  timing : one of the i2c_timing_e
   * @param  addressingMode : I2C_ADDRESSINGMODE_7BIT or I2C_ADDRESSINGMODE_10BIT
   * @param  ownAddress : device address
-  * @param  master : set to 1 to choose the master mode
   * @retval none
   */
-void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode, uint32_t ownAddress, uint8_t master)
+void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode, uint32_t ownAddress)
 {
   if (obj == NULL) {
     return;
@@ -193,7 +192,7 @@ void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode, u
   handle->Init.OwnAddress2     = 0xFF;
   handle->Init.AddressingMode  = addressingMode;
   handle->Init.DualAddressMode = I2C_DUALADDRESS_DISABLE;
-  handle->Init.GeneralCallMode = I2C_GENERALCALL_DISABLE;
+  handle->Init.GeneralCallMode = (obj->generalCall == 0) ? I2C_GENERALCALL_DISABLE : I2C_GENERALCALL_ENABLE;
   handle->Init.NoStretchMode   = I2C_NOSTRETCH_DISABLE;
 
   handle->State = HAL_I2C_STATE_RESET;
@@ -211,7 +210,6 @@ void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode, u
     Error_Handler();
   }
 
-  obj->isMaster = master;
   /* Initialize default values */
   obj->slaveRxNbData = 0;
   obj->slaveMode = SLAVE_MODE_LISTEN;
diff --git a/cores/arduino/stm32/twi.h b/cores/arduino/stm32/twi.h
index 4646658945..e6f4337845 100644
--- a/cores/arduino/stm32/twi.h
+++ b/cores/arduino/stm32/twi.h
@@ -100,13 +100,14 @@ struct i2c_s {
 #if !defined(STM32F0xx) && !defined(STM32L0xx)
   IRQn_Type irqER;
 #endif //!defined(STM32F0xx) && !defined(STM32L0xx)
-  volatile uint8_t slaveMode;
-  uint8_t isMaster;
   volatile int slaveRxNbData; // Number of accumulated bytes received in Slave mode
   void (*i2c_onSlaveReceive)(uint8_t *, int);
   void (*i2c_onSlaveTransmit)(void);
   volatile uint8_t i2cTxRxBuffer[I2C_TXRX_BUFFER_SIZE];
   volatile uint8_t i2cTxRxBufferSize;
+  volatile uint8_t slaveMode;
+  uint8_t isMaster;
+  uint8_t generalCall;
 };
 
 ///@brief I2C state
@@ -153,7 +154,7 @@ typedef enum {
 /* Exported functions ------------------------------------------------------- */
 void i2c_init(i2c_t *obj);
 void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode,
-                     uint32_t ownAddress, uint8_t master);
+                     uint32_t ownAddress);
 void i2c_deinit(i2c_t *obj);
 void i2c_setTiming(i2c_t *obj, uint32_t frequency);
 i2c_status_e i2c_master_write(i2c_t *obj, uint8_t dev_address, uint8_t *data, uint16_t size);
diff --git a/libraries/Wire/src/Wire.cpp b/libraries/Wire/src/Wire.cpp
index 7258794d64..f3b84022de 100644
--- a/libraries/Wire/src/Wire.cpp
+++ b/libraries/Wire/src/Wire.cpp
@@ -59,12 +59,12 @@ TwoWire::TwoWire(uint8_t sda, uint8_t scl)
 
 // Public Methods //////////////////////////////////////////////////////////////
 
-void TwoWire::begin(void)
+void TwoWire::begin(bool generalCall)
 {
-  begin(MASTER_ADDRESS);
+  begin(MASTER_ADDRESS, generalCall);
 }
 
-void TwoWire::begin(uint8_t address)
+void TwoWire::begin(uint8_t address, bool generalCall)
 {
   rxBufferIndex = 0;
   rxBufferLength = 0;
@@ -78,15 +78,13 @@ void TwoWire::begin(uint8_t address)
 
   ownAddress = address << 1;
 
-  if (address == MASTER_ADDRESS) {
-    master = true;
-  } else {
-    master = false;
-  }
+  _i2c.isMaster = (address == MASTER_ADDRESS) ? 1 : 0;
+
+  _i2c.generalCall = (generalCall == true) ? 1 : 0;
 
-  i2c_custom_init(&_i2c, I2C_100KHz, I2C_ADDRESSINGMODE_7BIT, ownAddress, master);
+  i2c_custom_init(&_i2c, I2C_100KHz, I2C_ADDRESSINGMODE_7BIT, ownAddress);
 
-  if (master == false) {
+  if (_i2c.isMaster == 0) {
     // i2c_attachSlaveTxEvent(&_i2c, reinterpret_cast<void(*)(i2c_t*)>(&TwoWire::onRequestService));
     // i2c_attachSlaveRxEvent(&_i2c, reinterpret_cast<void(*)(i2c_t*, uint8_t*, int)>(&TwoWire::onReceiveService));
 
@@ -95,9 +93,9 @@ void TwoWire::begin(uint8_t address)
   }
 }
 
-void TwoWire::begin(int address)
+void TwoWire::begin(int address, bool generalCall)
 {
-  begin((uint8_t)address);
+  begin((uint8_t)address, generalCall);
 }
 
 void TwoWire::end(void)
@@ -119,7 +117,7 @@ void TwoWire::setClock(uint32_t frequency)
 uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, uint32_t iaddress, uint8_t isize, uint8_t sendStop)
 {
   UNUSED(sendStop);
-  if (master == true) {
+  if (_i2c.isMaster == 1) {
     allocateRxBuffer(quantity);
     // error if no memory block available to allocate the buffer
     if (rxBuffer == nullptr) {
@@ -216,7 +214,7 @@ uint8_t TwoWire::endTransmission(uint8_t sendStop)
   UNUSED(sendStop);
   int8_t ret = 4;
 
-  if (master == true) {
+  if (_i2c.isMaster == 1) {
     // transmit buffer (blocking)
     switch (i2c_master_write(&_i2c, txAddress, txBuffer, txBufferLength)) {
       case I2C_OK :
diff --git a/libraries/Wire/src/Wire.h b/libraries/Wire/src/Wire.h
index 00a6ab620c..da3bee5da1 100644
--- a/libraries/Wire/src/Wire.h
+++ b/libraries/Wire/src/Wire.h
@@ -49,7 +49,6 @@ class TwoWire : public Stream {
     static uint8_t transmitting;
 
     uint8_t ownAddress;
-    bool master;
     i2c_t _i2c;
 
     static void (*user_onRequest)(void);
@@ -83,9 +82,9 @@ class TwoWire : public Stream {
     {
       _i2c.sda = sda;
     };
-    void begin();
-    void begin(uint8_t);
-    void begin(int);
+    void begin(bool generalCall = false);
+    void begin(uint8_t, bool generalCall = false);
+    void begin(int, bool generalCall = false);
     void end();
     void setClock(uint32_t);
     void beginTransmission(uint8_t);