diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs
index 91d86479..8f3b8101 100644
--- a/connect/src/spirc.rs
+++ b/connect/src/spirc.rs
@@ -352,7 +352,7 @@ impl Spirc {
         let _ = self.commands.send(SpircCommand::Shutdown);
     }
     pub fn shuffle(&self) {
-        let _ = self.commands.unbounded_send(SpircCommand::Shuffle);
+        let _ = self.commands.send(SpircCommand::Shuffle);
     }
 }
 
@@ -525,7 +525,6 @@ impl SpircTask {
             }
             SpircCommand::Shuffle => {
                 CommandSender::new(self, MessageType::kMessageTypeShuffle).send();
-                self.commands.close();
             }
         }
     }