diff --git a/src/main.cpp b/src/main.cpp
index 7df425a..a5be1ee 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -76,12 +76,18 @@ void loop()
   // SW2 - Staff Volume Down
   if (!digitalRead(4))
   {
-    if (maxVolume > 0)
+    if (maxVolume > STAFF_STEPS)
     {
       maxVolume -= STAFF_STEPS;
 
       if (userVolume > maxVolume)
       {
+        for (int i = 0; i < (userVolume - maxVolume); i++)
+        {
+          volumeDown();
+          potPosition--;
+        }
+
         userVolume = maxVolume;
         oldUserVolume = userVolume;
       }