diff --git a/Slim/Player/StreamingController.pm b/Slim/Player/StreamingController.pm
index 005f81f975..e9f4459f54 100644
--- a/Slim/Player/StreamingController.pm
+++ b/Slim/Player/StreamingController.pm
@@ -2230,6 +2230,13 @@ sub playerStopped {
 		}
 	}
 
+	# If queue finished playing then reset song queue
+	my $currsong = Slim::Player::Source::playingSongIndex($client) + 1;
+	my $count = Slim::Player::Playlist::count($client);
+	if ($currsong == $count) {
+		$self->resetSongqueue(0);
+	}
+
 	_eventAction($self, 'Stopped');
 }