diff --git a/native/mpvVideoPlayer.js b/native/mpvVideoPlayer.js
index c3154aa..dbf768d 100644
--- a/native/mpvVideoPlayer.js
+++ b/native/mpvVideoPlayer.js
@@ -239,7 +239,6 @@
             if (options.fullscreen) {
                 this.loading.show();
             }
-            window.api.power.setScreensaverEnabled(false);
             const elem = await this.createMediaElement(options);
             return await this.setCurrentSrc(elem, options);
         }
@@ -448,7 +447,6 @@
 
         stop(destroyPlayer) {
             window.api.player.stop();
-            window.api.power.setScreensaverEnabled(true);
 
             this.onEndedInternal();
 
@@ -460,7 +458,6 @@
 
         removeMediaDialog() {
             window.api.player.stop();
-            window.api.power.setScreensaverEnabled(true);
 
             window.api.player.setVideoRectangle(-1, 0, 0, 0);
 
@@ -682,7 +679,6 @@
 
     pause() {
         window.api.player.pause();
-        window.api.power.setScreensaverEnabled(true);
     }
 
     // This is a retry after error
@@ -693,7 +689,6 @@
 
     unpause() {
         window.api.player.play();
-        window.api.power.setScreensaverEnabled(false);
     }
 
     paused() {
diff --git a/src/power/PowerComponent.cpp b/src/power/PowerComponent.cpp
index f27f239..31c4aed 100644
--- a/src/power/PowerComponent.cpp
+++ b/src/power/PowerComponent.cpp
@@ -4,6 +4,7 @@
 #include "PowerComponent.h"
 #include "input/InputComponent.h"
 #include "settings/SettingsComponent.h"
+#include "player/PlayerComponent.h"
 
 #ifdef Q_OS_MAC
 #include "PowerComponentMac.h"
@@ -65,6 +66,11 @@ void PowerComponent::componentPostInitialize()
   InputComponent::Get().registerHostCommand("poweroff", this, "PowerOff");
   InputComponent::Get().registerHostCommand("reboot", this, "Reboot");
   InputComponent::Get().registerHostCommand("suspend", this, "Suspend");
+
+  connect(&PlayerComponent::Get(), &PlayerComponent::playbackStateChanged,
+          this, [this](const QString& state) { setScreensaverEnabled(state != "Playing"); });
+  connect(&PlayerComponent::Get(), &PlayerComponent::playbackStopped,
+          this, [this](bool) { setScreensaverEnabled(true); });
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////