diff --git a/variants/heltec_rc32/HeltecRC32Board.cpp b/variants/heltec_rc32/HeltecRC32Board.cpp
index 0517f5ff..59920d23 100644
--- a/variants/heltec_rc32/HeltecRC32Board.cpp
+++ b/variants/heltec_rc32/HeltecRC32Board.cpp
@@ -1,14 +1,4 @@
 #include "HeltecRC32Board.h"
-#if defined(UI_HAS_ROTARY_INPUT)
-#include "HeltecRC32RotaryInput.h"
-#endif
-
-#if defined(UI_HAS_ROTARY_INPUT)
-RotaryInput& HeltecRC32Board::rotaryInput() {
-  static HeltecRC32RotaryInput input(&periph_power);
-  return input;
-}
-#endif
 
 void HeltecRC32Board::begin() {
   ESP32Board::begin();
diff --git a/variants/heltec_rc32/HeltecRC32Board.h b/variants/heltec_rc32/HeltecRC32Board.h
index 5f3a0adf..5b2093c8 100644
--- a/variants/heltec_rc32/HeltecRC32Board.h
+++ b/variants/heltec_rc32/HeltecRC32Board.h
@@ -4,9 +4,6 @@
 #include <driver/rtc_io.h>
 #include <helpers/ESP32Board.h>
 #include <helpers/RefCountedDigitalPin.h>
-#if defined(UI_HAS_ROTARY_INPUT)
-#include <helpers/ui/RotaryInput.h>
-#endif
 
 #ifndef ADC_MULTIPLIER
   #define ADC_MULTIPLIER 4.9f
@@ -22,9 +19,6 @@ public:
   HeltecRC32Board() : periph_power(SENSOR_POWER_CTRL_PIN, SENSOR_POWER_ON){}
 
   void begin();
-#if defined(UI_HAS_ROTARY_INPUT)
-  RotaryInput& rotaryInput();
-#endif
   void onBeforeTransmit() override;
   void onAfterTransmit() override;
   void powerOff() override;
diff --git a/variants/heltec_rc32/target.cpp b/variants/heltec_rc32/target.cpp
index 386fc559..cc7e4deb 100644
--- a/variants/heltec_rc32/target.cpp
+++ b/variants/heltec_rc32/target.cpp
@@ -1,5 +1,8 @@
 #include <Arduino.h>
 #include "target.h"
+#if defined(UI_HAS_ROTARY_INPUT)
+#include "HeltecRC32RotaryInput.h"
+#endif
 
 HeltecRC32Board board;
 
@@ -27,7 +30,8 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock);
   DISPLAY_CLASS display;
   MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
 #if defined(UI_HAS_ROTARY_INPUT)
-  RotaryInput& rotary_input = board.rotaryInput();
+  static HeltecRC32RotaryInput rotaryInputImpl(&board.periph_power);
+  RotaryInput& rotary_input = rotaryInputImpl;
 #endif
 #endif