diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoStateController.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoStateController.java
index 25e9daa9f..de0c5bf01 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoStateController.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoStateController.java
@@ -527,12 +527,17 @@ public class VideoStateController extends PlayerEventListenerHelper implements M
     }
 
     private void restoreVolume() {
-        //if (!mPlayerTweaksData.isPlayerAutoVolumeEnabled() && mPlayerData.getPlayerVolume() == 1.0f) {
-        //    // Let global auto volume work
-        //    return;
-        //}
+        float newVolume = mPlayerData.getPlayerVolume();
 
-        getPlayer().setVolume(mPlayerTweaksData.isPlayerAutoVolumeEnabled() ? mPlayerData.getPlayerVolume() * getVideo().volume : mPlayerData.getPlayerVolume());
+        if (mPlayerTweaksData.isPlayerAutoVolumeEnabled()) {
+            newVolume *= getVideo().volume;
+
+            if (getVideo().isShorts || getVideo().getDurationMs() <= 60_000) {
+                newVolume /= 2;
+            }
+        }
+
+        getPlayer().setVolume(newVolume);
     }
 
     private void restoreFormats() {