diff --git a/crabidy-server/src/playback.rs b/crabidy-server/src/playback.rs
index 2f8ddc2..b604e4d 100644
--- a/crabidy-server/src/playback.rs
+++ b/crabidy-server/src/playback.rs
@@ -249,13 +249,13 @@ impl Playback {
                         {
                             let mut queue = self.queue.lock().unwrap();
                             debug!("got queue lock");
-                            shuffle = queue.shuffle;
                             repeat = queue.repeat;
                             if queue.shuffle {
-                                queue.shuffle_on()
-                            } else {
                                 queue.shuffle_off()
+                            } else {
+                                queue.shuffle_on()
                             }
+                            shuffle = queue.shuffle;
                         }
                         debug!("queue lock released");
                         let queue_update_tx = self.update_tx.clone();
@@ -274,12 +274,12 @@ impl Playback {
                             let mut queue = self.queue.lock().unwrap();
                             debug!("got queue lock");
                             shuffle = queue.shuffle;
-                            repeat = queue.repeat;
                             if queue.repeat {
                                 queue.repeat = false
                             } else {
                                 queue.repeat = true
                             }
+                            repeat = queue.repeat;
                         }
                         debug!("queue lock released");
                         let queue_update_tx = self.update_tx.clone();
diff --git a/crabidy-server/src/rpc.rs b/crabidy-server/src/rpc.rs
index dc78cf3..17bbce4 100644
--- a/crabidy-server/src/rpc.rs
+++ b/crabidy-server/src/rpc.rs
@@ -242,7 +242,7 @@ impl CrabidyService for RpcService {
         &self,
         _request: tonic::Request<ToggleRepeatRequest>,
     ) -> std::result::Result<tonic::Response<ToggleRepeatResponse>, tonic::Status> {
-        debug!("Received toggle_shuffle request");
+        debug!("Received toggle_repeat request");
         let playback_tx = self.playback_tx.clone();
         let span = debug_span!("play-chan");
         playback_tx