diff --git a/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java b/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java
index 3bcf8d64..3fd938ce 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java
@@ -189,6 +189,10 @@ public class ImageViewerPresenter implements MultiImageView.Callback, ViewPager.
     }
 
     private void onPageSwipedTo(int position) {
+        // Reset volume icon.
+        // If it has audio, we'll know after it is loaded.
+        callback.showVolumeMenuItem(false, true);
+
         PostImage postImage = images.get(selectedPosition);
         setTitle(postImage, position);
         callback.scrollToImage(postImage);
@@ -205,9 +209,6 @@ public class ImageViewerPresenter implements MultiImageView.Callback, ViewPager.
 
         callback.showProgress(progress.get(selectedPosition) >= 0f);
         callback.onLoadProgress(progress.get(selectedPosition));
-
-        // If it has audio, we'll know after it is loaded.
-        callback.showVolumeMenuItem(false, true);
     }
 
     // Called from either a page swipe caused a lowres image to the center or an
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/view/MultiImageView.java b/Clover/app/src/main/java/org/floens/chan/ui/view/MultiImageView.java
index 67f4a2d7..cddf0436 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/view/MultiImageView.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/view/MultiImageView.java
@@ -182,14 +182,13 @@ public class MultiImageView extends FrameLayout implements View.OnClickListener
 
     public void setVolume(boolean muted) {
         final float volume = muted ? 0f : 1f;
-        if (ChanSettings.videoUseExoplayer.get()) {
-            if (exoPlayer != null) {
-                exoPlayer.getAudioComponent().setVolume(volume);
-            }
-        } else {
-            if (mediaPlayer != null) {
-                mediaPlayer.setVolume(volume, volume);
+        if (exoPlayer != null) {
+            Player.AudioComponent audioComponent = exoPlayer.getAudioComponent();
+            if (audioComponent != null) {
+                audioComponent.setVolume(volume);
             }
+        } else if (mediaPlayer != null) {
+            mediaPlayer.setVolume(volume, volume);
         }
     }