diff --git a/rigo/RigoDaemon/app.py b/rigo/RigoDaemon/app.py
index 0b749185f..290ae013c 100755
--- a/rigo/RigoDaemon/app.py
+++ b/rigo/RigoDaemon/app.py
@@ -279,6 +279,8 @@ class RigoDaemonService(dbus.service.Object):
         Raise ActivityStates.BusyError if already busy.
         """
         with self._current_activity_mutex:
+            if self._current_activity == activity:
+                raise ActivityStates.SameError()
             if self._current_activity != ActivityStates.AVAILABLE:
                 raise ActivityStates.BusyError()
             self._current_activity = activity