diff --git a/renderer/main.js b/renderer/main.js
index b1e932ad..d0cc1987 100644
--- a/renderer/main.js
+++ b/renderer/main.js
@@ -415,8 +415,7 @@ function setVolume (volume) {
   if (isCasting()) {
     Cast.setVolume(volume)
   } else {
-    // Persist volume across videos
-    state.setVolume = volume
+    state.playing.setVolume = volume
   }
 }
 
diff --git a/renderer/views/player.js b/renderer/views/player.js
index e0094a2e..e6fb35aa 100644
--- a/renderer/views/player.js
+++ b/renderer/views/player.js
@@ -51,8 +51,9 @@ function renderMedia (state) {
       mediaElement.playbackRate = state.playing.playbackRate
     }
     // Set volume
-    if (state.setVolume !== null && isFinite(state.setVolume)) {
-      mediaElement.volume = state.setVolume
+    if (state.playing.setVolume !== null && isFinite(state.playing.setVolume)) {
+      mediaElement.volume = state.playing.setVolume
+      state.playing.setVolume = null
     }
 
     // Switch to the newly added subtitle track, if available