diff --git a/clapper_src/controls.js b/clapper_src/controls.js
index 2f8b48e5..165d4996 100644
--- a/clapper_src/controls.js
+++ b/clapper_src/controls.js
@@ -370,9 +370,11 @@ class ClapperControls extends Gtk.Box
         scrollController.connect('scroll', player._onScroll.bind(player));
         this.volumeButton.add_controller(scrollController);
 
-        let lastVolume = settings.get_double('volume-last');
-        let cubicVolume = Misc.getCubicValue(lastVolume);
-        this.volumeScale.set_value(cubicVolume);
+        let initialVolume = (settings.get_string('volume-initial') === 'custom')
+            ? settings.get_int('volume-value') / 100
+            : Misc.getCubicValue(settings.get_double('volume-last'));
+
+        this.volumeScale.set_value(initialVolume);
     }
 
     _onUnfullscreenClicked(button)
diff --git a/clapper_src/player.js b/clapper_src/player.js
index 9a6f72b0..4d0ce5b0 100644
--- a/clapper_src/player.js
+++ b/clapper_src/player.js
@@ -359,8 +359,7 @@ class ClapperPlayer extends PlayerBase
 
         if(!this.doneStartup) {
             this.doneStartup = true;
-            if(settings.get_string('volume-initial') === 'custom')
-                this.set_volume(settings.get_int('volume-value') / 100);
+
             if(settings.get_boolean('fullscreen-auto')) {
                 let root = player.widget.get_root();
                 let clapperWidget = root.get_child();