Index: Slim/Control/Commands.pm
===================================================================
--- Slim/Control/Commands.pm	(revision 30374)
+++ Slim/Control/Commands.pm	(working copy)
@@ -293,15 +293,19 @@
 		$client->execute([ 'stop' ]);
 		
 		foreach ($client->controller()->allPlayers()) {
-		
-			$_->sendFrame( serv => \$packed );
 			
-			if ( main::SLIM_SERVICE ) {
-				# Bug 7973, forget client immediately
-				$_->forgetClient;
-			}
-			else {
-				$_->execute([ 'client', 'forget' ]);
+			if ($_->hasServ()) {
+				$_->sendFrame( serv => \$packed );
+				
+				if ( main::SLIM_SERVICE ) {
+					# Bug 7973, forget client immediately
+					$_->forgetClient;
+				}
+				else {
+					Slim::Utils::Timers::setTimer($_, time() + 5,
+						sub { $_->execute([ 'client', 'forget' ]; }
+					);
+				}
 			}
 		}
 	}