diff --git a/src/helpers/ui/ST7735Display.cpp b/src/helpers/ui/ST7735Display.cpp
index aad12d1b4..cb5737e18 100644
--- a/src/helpers/ui/ST7735Display.cpp
+++ b/src/helpers/ui/ST7735Display.cpp
@@ -102,7 +102,12 @@
 static TFT_eSPI lcd = TFT_eSPI(160, 80);
 static uint32_t curr_color;
 
-#define  _spi   (&SPI1)
+#if defined(HELTEC_LORA_V3) || defined(HELTEC_TRACKER_V2)
+  static SPIClass tft_spi(SPI3_HOST);
+  #define  _spi   (&tft_spi)
+#else
+  #define  _spi   (&SPI1)
+#endif
 
 SPISettings  _spiSettings = SPISettings(40000000, MSBFIRST, SPI_MODE0);
 
@@ -434,7 +439,7 @@ bool ST7735Display::begin() {
     pinMode(PIN_TFT_LEDA_CTL, OUTPUT);
 
 #ifdef ESP_PLATFORM
-    _spi->begin(_clk,_miso,_mosi,-1);
+    _spi->begin(PIN_TFT_SCL, -1 /* _miso */, PIN_TFT_SDA /* _mosi */, -1);
 #else
     _spi->begin(); 
 #endif
diff --git a/variants/heltec_tracker/platformio.ini b/variants/heltec_tracker/platformio.ini
index 69293d707..07d2e987a 100644
--- a/variants/heltec_tracker/platformio.ini
+++ b/variants/heltec_tracker/platformio.ini
@@ -47,7 +47,7 @@ build_src_filter = ${esp32_base.build_src_filter}
 lib_deps =
   ${esp32_base.lib_deps}
   stevemarple/MicroNMEA @ ^2.0.6
-  adafruit/Adafruit ST7735 and ST7789 Library @ ^1.11.0
+  bodmer/TFT_eSPI @ ^2.4.31
 
 [env:Heltec_Wireless_Tracker_companion_radio_usb]
 extends = Heltec_tracker_base
diff --git a/variants/heltec_tracker_v2/platformio.ini b/variants/heltec_tracker_v2/platformio.ini
index d57c2113f..f1fe9dd05 100644
--- a/variants/heltec_tracker_v2/platformio.ini
+++ b/variants/heltec_tracker_v2/platformio.ini
@@ -55,7 +55,7 @@ build_src_filter = ${esp32_base.build_src_filter}
 lib_deps =
   ${esp32_base.lib_deps}
   ${sensor_base.lib_deps}
-  adafruit/Adafruit ST7735 and ST7789 Library @ ^1.11.0
+  bodmer/TFT_eSPI @ ^2.4.31
 
 [env:heltec_tracker_v2_repeater]
 extends = Heltec_tracker_v2