diff --git a/NEWS b/NEWS
index 8ebb7ac2de7dafc077bf02344171f8db4a9b6f21..0101ac310a54cb3b9d3ac146fec33a2f18e7c13e 100644
--- a/NEWS
+++ b/NEWS
@@ -407,6 +407,7 @@ documents those changes that are of interest to users and admins.
     instead of an absolute.
  -- Get ReturnToService=2 working for front-end configurations (e.g. Cray or
     BlueGene).
+ -- Fix bug that could schedule jobs or steps on non-responding nodes.
 
 * Changes in SLURM 2.1.9
 ========================
diff --git a/src/slurmctld/node_mgr.c b/src/slurmctld/node_mgr.c
index 3186249ea2d952e8c6cd15791a5020fa4a062aa5..3fc32f78126dcf789728ade3ba6bef12e274263a 100644
--- a/src/slurmctld/node_mgr.c
+++ b/src/slurmctld/node_mgr.c
@@ -1973,7 +1973,7 @@ static void _sync_bitmaps(struct node_record *node_ptr, int job_count)
 		bit_set (share_node_bitmap, node_inx);
 	}
 	if (IS_NODE_DOWN(node_ptr) || IS_NODE_DRAIN(node_ptr) ||
-	    IS_NODE_FAIL(node_ptr))
+	    IS_NODE_FAIL(node_ptr) || IS_NODE_NO_RESPOND(node_ptr))
 		bit_clear (avail_node_bitmap, node_inx);
 	else
 		bit_set   (avail_node_bitmap, node_inx);