diff --git a/src/input/encoder.cpp b/src/input/encoder.cpp
index 1ba1ece..f4a5a63 100644
--- a/src/input/encoder.cpp
+++ b/src/input/encoder.cpp
@@ -2,6 +2,7 @@
 #include <Versatile_RotaryEncoder.h>
 
 #include <ui/display.hpp>
+#include <audio/tone_generator.hpp>
 
 #ifndef ENCODER_A_PIN
 #define ENCODER_A_PIN 12
@@ -23,7 +24,6 @@ namespace Encoder
     void handleRotate(int8_t rotation);
 
     Versatile_RotaryEncoder *encoder;
-    int frequency = 220; // A4
 
     void init()
     {
@@ -63,6 +63,7 @@ namespace Encoder
     {
         Serial.print("Encoder rotated by ");
         Serial.println(rotation);
+        int frequency = ToneGenerator::getFrequency();
         if (rotation > 0)
         {
             frequency += 10;
@@ -71,6 +72,7 @@ namespace Encoder
         {
             frequency -= 10;
         }
+        ToneGenerator::setFrequency(frequency);
         Serial.print("Frequency: ");
         Serial.println(frequency);