diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24d1a17a..6db058bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [core] Removed unsafe code (breaking)
 - [playback] Adhere to ReplayGain spec when calculating gain normalisation factor.
 - [playback] `alsa`: Use `--volume-range` overrides for softvol controls
+- [connect] Don't panic when activating shuffle without previous interaction.
 
 ### Removed
 - [playback] `alsamixer`: previously deprecated option `mixer-card` has been removed.
diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs
index 344f63b7..b574ff52 100644
--- a/connect/src/spirc.rs
+++ b/connect/src/spirc.rs
@@ -668,15 +668,15 @@ impl SpircTask {
                 self.state.set_shuffle(frame.get_state().get_shuffle());
                 if self.state.get_shuffle() {
                     let current_index = self.state.get_playing_track_index();
-                    {
-                        let tracks = self.state.mut_track();
+                    let tracks = self.state.mut_track();
+                    if !tracks.is_empty() {
                         tracks.swap(0, current_index as usize);
                         if let Some((_, rest)) = tracks.split_first_mut() {
                             let mut rng = rand::thread_rng();
                             rest.shuffle(&mut rng);
                         }
+                        self.state.set_playing_track_index(0);
                     }
-                    self.state.set_playing_track_index(0);
                 } else {
                     let context = self.state.get_context_uri();
                     debug!("{:?}", context);