diff --git a/src/player.c b/src/player.c
index 1df7f5e8..4d6c0627 100644
--- a/src/player.c
+++ b/src/player.c
@@ -1205,6 +1205,10 @@ device_remove(struct raop_device *dev)
 
   DPRINTF(E_DBG, L_PLAYER, "Removing AirTunes device %s; stopped advertising\n", dev->name);
 
+  /* Make sure device isn't selected anymore */
+  if (dev->selected)
+    speaker_deselect_raop(dev);
+
   if (!prev)
     dev_list = dev->next;
   else