diff --git a/syncplay/client.py b/syncplay/client.py
index 84e35c94f..2e414f041 100644
--- a/syncplay/client.py
+++ b/syncplay/client.py
@@ -166,7 +166,16 @@ def updatePlayerStatus(self, paused, position):
         self._playerPosition = position
         self._playerPaused = paused
         if pauseChange and utils.meetsMinVersion(self.serverVersion, constants.USER_READY_MIN_VERSION):
-            if not paused and not self.instaplayConditionsMet():
+            if not self.userlist.currentUser.canControl():
+                self._player.setPaused(self._globalPaused)
+                self.toggleReady(manuallyInitiated=True)
+                self._playerPaused = self._globalPaused
+                pauseChange = False
+                if self.userlist.currentUser.isReady():
+                    self.ui.showMessage(getMessage("set-as-ready-notification"))
+                else:
+                    self.ui.showMessage(getMessage("set-as-not-ready-notification"))
+            elif not paused and not self.instaplayConditionsMet():
                 paused = True
                 self._player.setPaused(paused)
                 self._playerPaused = paused
diff --git a/syncplay/messages.py b/syncplay/messages.py
index 21e8ed544..ad8d24326 100755
--- a/syncplay/messages.py
+++ b/syncplay/messages.py
@@ -36,6 +36,8 @@
       "not-all-ready" : u"Not ready: {}", # Usernames
       "all-users-ready" : u"Everyone is ready ({} users)", #Number of ready users
       "ready-to-unpause-notification" : u"You are now set as ready - unpause again to unpause",
+      "set-as-ready-notification" : u"You are now set as ready",
+      "set-as-not-ready-notification" : u"You are now set as not ready",
       "autoplaying-notification" : u"Auto-playing in {}...",
 
       "identifying-as-controller-notification" : u"Identifying as room operator with password '{}'...",
@@ -388,6 +390,8 @@
       "not-all-ready" : u"Not ready: {}", # Usernames # TODO: Translate into Russian
       "all-users-ready" : u"Everyone is ready ({} users)", #Number of ready users # TODO: Translate into Russian
       "ready-to-unpause-notification" : u"You are now set as ready - unpause again to unpause", # TODO: Translate into Russian
+      "set-as-ready-notification" : u"You are now set as ready", # TODO: Translate into Russian
+      "set-as-not-ready-notification" : u"You are now set as not ready", # TODO: Translate into Russian
       "autoplaying-notification" : u"Auto-playing in {}...", # TODO: Translate into Russian
 
       "identifying-as-controller-notification" : u"Identifying as room operator with password '{}'...", # TODO: Translate into Russian
@@ -740,6 +744,8 @@
       "not-all-ready" : u"Noch nicht bereit: {}", # Usernames
       "all-users-ready" : u"Alle sind bereit ({} Nutzer)", #Number of ready users
       "ready-to-unpause-notification" : u"Du bist bereit - noch einmal fortsetzen klicken zum abspielen",
+      "set-as-ready-notification" : u"Du bist bereit", # TODO: Check German translation
+      "set-as-not-ready-notification" : u"You are now set as not ready", # TODO: Translate into German
       "autoplaying-notification" : u"Starte in {}...",
 
       "identifying-as-controller-notification" : u"Identifiziere als Raumleiter mit Passwort '{}'...",  # TODO: find a better translation to "room operator"