Index: Slim/Player/Source.pm
===================================================================
--- Slim/Player/Source.pm	(revision 3094)
+++ Slim/Player/Source.pm	(working copy)
@@ -924,6 +924,9 @@
 
 sub streamingSong {
 	my $client = Slim::Player::Sync::masterOrSelf(shift);
+	unless (scalar(@{$client->currentsongqueue()})) {
+		$client->streamingSongIndex(0);
+	}
 	return $client->currentsongqueue()->[0];
 }