diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index 4d12de8adb..709b6c7b04 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -607,13 +607,7 @@ sub main() {
 				$server->update();
 			}
 	
-			# Update fallen servers 
-			my @servers_db = get_db_rows ($DBH, "SELECT id_server, server_keepalive FROM tserver");
-			for (@servers_db) {
-				my %server_db = %$_;
-				my $expected_update = strftime ("%Y-%m-%d %H:%M:%S", localtime(time() - $server_db{'server_keepalive'} * 2));
-				db_do ($DBH, "UPDATE tserver SET status = 0 WHERE keepalive < ? AND id_server = ?", $expected_update, $server_db{'id_server'});
-			}
+			db_do ($DBH, "UPDATE tserver SET status = 0 WHERE now()-keepalive > 2*server_keepalive");
 
 			# Set the master server
 			pandora_set_master(\%Config, $DBH);