diff --git a/src/spotify_worker.rs b/src/spotify_worker.rs
index 80cd2a5..ad6b830 100644
--- a/src/spotify_worker.rs
+++ b/src/spotify_worker.rs
@@ -99,6 +99,12 @@ impl Worker {
         let mut ui_refresh = time::interval(Duration::from_millis(400));
 
         loop {
+            if self.session.is_invalid() {
+                info!("Librespot session invalidated, terminating worker");
+                self.events.send(Event::Player(PlayerEvent::Stopped));
+                break;
+            }
+
             tokio::select! {
                 cmd = self.commands.next() => match cmd {
                     Some(WorkerCommand::Load(playable, start_playing, position_ms)) => {
@@ -195,11 +201,6 @@ impl Worker {
                     self.token_task = Box::pin(futures::future::pending());
                 }
             }
-
-            if self.session.is_invalid() {
-                self.events.send(Event::Player(PlayerEvent::Stopped));
-                break;
-            }
         }
     }
 }