diff --git a/src/boards_pinout.h b/src/boards_pinout.h
index 00275dc..28c4412 100644
--- a/src/boards_pinout.h
+++ b/src/boards_pinout.h
@@ -149,13 +149,13 @@
     #define OLED_RST    -1      // Reset pin # (or -1 if sharing Arduino reset pin)
 #endif
 
-#if defined(HELTEC_V2)
+#if defined(HELTEC_V2) || defined(HELTEC_WS)
     #define OLED_SDA    4
     #define OLED_SCL    15
     #define OLED_RST    16
 #endif
 
-#if defined(HELTEC_V3) || defined(HELTEC_WS)
+#if defined(HELTEC_V3)
     #define OLED_SDA    17
     #define OLED_SCL    18
     #define OLED_RST    21
diff --git a/src/power_utils.cpp b/src/power_utils.cpp
index 78af6e7..ae2ff3a 100644
--- a/src/power_utils.cpp
+++ b/src/power_utils.cpp
@@ -163,7 +163,7 @@ namespace POWER_Utils {
             pinMode(ADC_CTRL, OUTPUT);
         #endif
 
-        #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_WS)
+        #if defined(HELTEC_WIRELESS_TRACKER)
             Wire.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
         #endif
 
@@ -171,7 +171,7 @@ namespace POWER_Utils {
             Wire1.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
         #endif
 
-        #if defined(HELTEC_V3)
+        #if defined(HELTEC_V3) || defined(HELTEC_WS)
             Wire.begin(OLED_SDA, OLED_SCL);
         #endif