diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index fa3d1bbfcf..d1e79abbe2 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -802,7 +802,8 @@ sub main() {
 
 			db_do ($DBH,
 				"UPDATE tserver SET status = -1
-				WHERE UNIX_TIMESTAMP(now())-UNIX_TIMESTAMP(keepalive) > 2*server_keepalive"
+				WHERE UNIX_TIMESTAMP(now())-UNIX_TIMESTAMP(keepalive) > 2*server_keepalive
+				AND status != 0"
 			);
 
 			# Set the master server