diff --git a/src/main.cpp b/src/main.cpp
index 1b90bd9..d83c7c9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -205,7 +205,7 @@ void loop()
     }
     else
     {
-      for (int i = 0; i < 2; i++)
+      for (int i = 0; i < USER_STEPS; i++)
       {
         volumeUp();
       }
@@ -222,11 +222,21 @@ void loop()
   {
     if ((userVolume - USER_STEPS) < 0)
     {
+      for (int i = 0; i < userVolume; i++)
+      {
+        volumeDown();
+      }
+
       userVolume = 0;
       oldUserVolume = userVolume;
     }
     else
     {
+      for (int i = 0; i < USER_STEPS; i++)
+      {
+        volumeDown();
+      }
+
       userVolume -= USER_STEPS;
       oldUserVolume = userVolume;
     }