diff --git a/ctdb/server/ctdb_server.c b/ctdb/server/ctdb_server.c
index d1ef4f46f33..5c579f00228 100644
--- a/ctdb/server/ctdb_server.c
+++ b/ctdb/server/ctdb_server.c
@@ -335,7 +335,7 @@ void ctdb_node_dead(struct ctdb_node *node)
 		return;
 	}
 	node->ctdb->num_connected--;
-	node->flags |= NODE_FLAGS_DISCONNECTED;
+	node->flags |= NODE_FLAGS_DISCONNECTED | NODE_FLAGS_UNHEALTHY;
 	node->rx_cnt = 0;
 	node->dead_count = 0;
 	DEBUG(1,("%s: node %s is dead: %u connected\n", 
@@ -357,6 +357,7 @@ void ctdb_node_connected(struct ctdb_node *node)
 	node->ctdb->num_connected++;
 	node->dead_count = 0;
 	node->flags &= ~NODE_FLAGS_DISCONNECTED;
+	node->flags |= NODE_FLAGS_UNHEALTHY;
 	DEBUG(1,("%s: connected to %s - %u connected\n", 
 		 node->ctdb->name, node->name, node->ctdb->num_connected));
 }