diff --git a/src/warden-server/bin/unregisterClient.pl b/src/warden-server/bin/unregisterClient.pl
index 04c6edf16fffa122573abe3d858327955ce8d1e6..90981eb7227b6f2cdb924b5e99e13ceccc75f1b6 100755
--- a/src/warden-server/bin/unregisterClient.pl
+++ b/src/warden-server/bin/unregisterClient.pl
@@ -99,7 +99,7 @@ if (!defined $id) {
   WardenCommon::errMsg("Client (#$client_id) is not registered at $warden_server");
 } else {
   if ($client_type eq 's') {
-    $sth = $DBH->prepare("DELETE FROM clients WHERE client_id = ?;") or die "Cannot prepare statement: " . $DBH->errstr;
+    $sth = $DBH->prepare("UPDATE clients SET valid = 'f' WHERE client_id = ?;") or die "Cannot prepare statement: " . $DBH->errstr;
     my $ret_val = $sth->execute($client_id) or die "Cannot execute statement: " . $sth->errstr;
     if ($ret_val == 1) {
       $sth = $DBH->prepare("UPDATE events SET valid = 'f' where hostname = ? AND service = ?;") or die "Cannot prepare statement: " . $DBH->errstr;
@@ -110,7 +110,7 @@ if (!defined $id) {
       WardenCommon::errMsg("Unregistration of sender client (client_id: #$client_id) FAILED!!!");
     }
   } else {
-    $sth = $DBH->prepare("DELETE FROM clients WHERE client_id = ?;") or die "Cannot prepare statement: " . $DBH->errstr;
+    $sth = $DBH->prepare("UPDATE clients SET valid = 'f' WHERE client_id = ?;") or die "Cannot prepare statement: " . $DBH->errstr;
     my $ret_val = $sth->execute($client_id) or die "Cannot execute statement: " . $sth->errstr;
     if ($ret_val == 1) {
       WardenCommon::sendMsg($SYSLOG, $SYSLOG_VERBOSE, $SYSLOG_FACILITY, "info", "Receiver '$hostname' [client_id: '$client_id', type: '$type'] was deleted from $warden_server");