diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index ef867efac12..19e843ef3f2 100644
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -1325,9 +1325,17 @@ again:
 					    vnnmap, nodemap->nodes[j].vnn);
 				goto again;
 			}
-			if ((remote_nodemap->nodes[i].flags & NODE_FLAGS_INACTIVE) != 
-			    (nodemap->nodes[i].flags & NODE_FLAGS_INACTIVE)) {
-				DEBUG(0, (__location__ " Remote node:%u has different nodemap flags for %d (0x%x vs 0x%x)\n", 
+			if ((remote_nodemap->nodes[i].flags & NODE_FLAGS_DISCONNECTED) != 
+			    (nodemap->nodes[i].flags & NODE_FLAGS_DISCONNECTED)) {
+				DEBUG(0, (__location__ " Remote node:%u has different nodemap disconnected flag for %d (0x%x vs 0x%x)\n", 
+					  nodemap->nodes[j].vnn, i,
+					  remote_nodemap->nodes[i].flags, nodemap->nodes[i].flags));
+				do_recovery(rec, mem_ctx, vnn, num_active, nodemap, 
+					    vnnmap, nodemap->nodes[j].vnn);
+				goto again;
+			} else if ((remote_nodemap->nodes[i].flags & NODE_FLAGS_BANNED) != 
+			    (nodemap->nodes[i].flags & NODE_FLAGS_BANNED)) {
+				DEBUG(0, (__location__ " Remote node:%u has different nodemap banned flag for %d (0x%x vs 0x%x)\n", 
 					  nodemap->nodes[j].vnn, i,
 					  remote_nodemap->nodes[i].flags, nodemap->nodes[i].flags));
 				do_recovery(rec, mem_ctx, vnn, num_active, nodemap,