diff --git a/src/slurmctld/job_scheduler.c b/src/slurmctld/job_scheduler.c
index 1c88a7a251282682951611beb66665892d6860d7..e03f48163847b490006b1b42de158b851e1393b0 100644
--- a/src/slurmctld/job_scheduler.c
+++ b/src/slurmctld/job_scheduler.c
@@ -3658,7 +3658,9 @@ static void *_run_prolog(void *arg)
 			error("prolog_slurmctld job %u now defunct", job_id);
 	}
 	prolog_running_decr(job_ptr);
-	if (job_ptr && job_ptr->node_bitmap) {
+	if (power_save_test()) {
+		/* Wait for node to register after booting */
+	} else if (job_ptr && job_ptr->node_bitmap) {
 		for (i=0; i<node_record_count; i++) {
 			if (bit_test(job_ptr->node_bitmap, i) == 0)
 				continue;