diff --git a/lib/lib_display/UDisplay/uDisplay.cpp b/lib/lib_display/UDisplay/uDisplay.cpp
index e4610223d..4af702125 100755
--- a/lib/lib_display/UDisplay/uDisplay.cpp
+++ b/lib/lib_display/UDisplay/uDisplay.cpp
@@ -242,7 +242,7 @@ uDisplay::uDisplay(char *lp) : Renderer(800, 600) {
               if (wire_n == 1) {
                 wire = &Wire;
               } else {
-#ifdef ESP32               
+#if SOC_HP_I2C_NUM > 1
                 wire = &Wire1;
 #else
                 wire = &Wire;
@@ -636,7 +636,7 @@ uDisplay::uDisplay(char *lp) : Renderer(800, 600) {
                 if (ut_mode == 1) {
                   ut_wire = &Wire;
                 } else {
-#ifdef ESP32
+#if SOC_HP_I2C_NUM > 1
                   ut_wire = &Wire1;
 #else
                   ut_wire = &Wire;
@@ -1076,7 +1076,7 @@ Renderer *uDisplay::Init(void) {
     if (wire_n == 0) {
       wire = &Wire;
     }
-#ifdef ESP32
+#if SOC_HP_I2C_NUM > 1
     if (wire_n == 1) {
       wire = &Wire1;
     }
diff --git a/lib/lib_i2c/BM8563_RTC/src/BM8563.h b/lib/lib_i2c/BM8563_RTC/src/BM8563.h
index dc7867b22..fbba8d752 100644
--- a/lib/lib_i2c/BM8563_RTC/src/BM8563.h
+++ b/lib/lib_i2c/BM8563_RTC/src/BM8563.h
@@ -24,11 +24,11 @@ typedef struct
 class BM8563 {
 public:
   BM8563();
-  #ifdef ESP32
-      void setBus(uint32_t _bus) { myWire = _bus ? &Wire1 : &Wire; };
-  #else
-      void setBus(uint32_t _bus) { myWire = &Wire; };
-  #endif
+#if SOC_HP_I2C_NUM > 1
+  void setBus(uint32_t _bus) { myWire = _bus ? &Wire1 : &Wire; };
+#else
+  void setBus(uint32_t _bus) { myWire = &Wire; };
+#endif
 
   void begin(void);
   void GetBm8563Time(void);
diff --git a/lib/lib_i2c/MPU_accel/src/MPU_accel.h b/lib/lib_i2c/MPU_accel/src/MPU_accel.h
index 7b522a836..f3f027a21 100755
--- a/lib/lib_i2c/MPU_accel/src/MPU_accel.h
+++ b/lib/lib_i2c/MPU_accel/src/MPU_accel.h
@@ -74,11 +74,11 @@ class MPU_accel {
       uint32_t model = 6886;    // MPU model number
     public:
       MPU_accel(void) {};
-  #ifdef ESP32
+#if SOC_HP_I2C_NUM > 1
       void setBus(uint32_t _bus) { myWire = _bus ? &Wire1 : &Wire; };
-  #else
+#else
       void setBus(uint32_t _bus) { myWire = &Wire; };
-  #endif
+#endif
       int Init(void);
       uint32_t getModel(void) const { return model; }
       void getAccelAdc(int16_t* ax, int16_t* ay, int16_t* az);
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino b/tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino
index 0f6dbccb2..df86f9e6b 100755
--- a/tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino
@@ -13160,7 +13160,7 @@ uint32_t script_i2c(uint8_t sel, uint16_t val, uint32_t val1) {
   switch (sel) {
     case 0:
       glob_script_mem.script_i2c_addr = val;
-#ifdef ESP32
+#if defined(ESP32) && defined(USE_I2C_BUS2)
       if (val1 == 0) glob_script_mem.script_i2c_wire = &Wire;
       else glob_script_mem.script_i2c_wire = &Wire1;
 #else
@@ -13209,7 +13209,7 @@ uint32_t script_i2c(uint8_t sel, uint16_t val, uint32_t val1) {
       glob_script_mem.script_i2c_wire->endTransmission();
       break;
     case 14:
- #ifdef ESP32
+#if defined(ESP32) && defined(USE_I2C_BUS2)
       Wire1.end();
       Wire1.begin(val & 0x7f, val1);
       glob_script_mem.script_i2c_wire = &Wire1;
@@ -13217,7 +13217,7 @@ uint32_t script_i2c(uint8_t sel, uint16_t val, uint32_t val1) {
       if (val & 128) {
         XsnsCall(FUNC_INIT);
       }
- #endif     
+#endif     
       break;
   }
   return rval;
diff --git a/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino b/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino
index f376ee8c2..5c19209fa 100644
--- a/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino
+++ b/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino
@@ -397,7 +397,7 @@ Renderer *Init_uDisplay(const char *desc) {
         if (!wire_n) {
           GT911_Touch_Init(&Wire, irq, rst, xs, ys);
         }
-#ifdef ESP32
+#if defined(ESP32) && defined(USE_I2C_BUS2)
         else {
           GT911_Touch_Init(&Wire1, irq, rst, xs, ys);
         }
@@ -414,7 +414,7 @@ Renderer *Init_uDisplay(const char *desc) {
         if (!wire_n) { 
           FT5206_Touch_Init(Wire);
         }
-#ifdef ESP32
+#if defined(ESP32) && defined(USE_I2C_BUS2)
         else {
           FT5206_Touch_Init(Wire1);
         }
diff --git a/tasmota/tasmota_xsns_sensor/xsns_103_sen5x.ino b/tasmota/tasmota_xsns_sensor/xsns_103_sen5x.ino
index be21ff1e9..7d014bd1a 100644
--- a/tasmota/tasmota_xsns_sensor/xsns_103_sen5x.ino
+++ b/tasmota/tasmota_xsns_sensor/xsns_103_sen5x.ino
@@ -75,7 +75,7 @@ void sen5x_Init(void) {
 
   sen5x = new SensirionI2CSen5x();
   if (1 == usingI2cBus) {
-#ifdef ESP32
+#if defined(ESP32) && defined(USE_I2C_BUS2)
     sen5x->begin(Wire1);
 #else
     sen5x->begin(Wire);