diff --git a/NEWS b/NEWS
index d3aaae646406d7d610beee972d26ad248729b421..bb90d5ace0e8e763e6dc2fe511cbfb0e092ce6de 100644
--- a/NEWS
+++ b/NEWS
@@ -40,6 +40,7 @@ documents those changes that are of interest to users and administrators.
     generic string.
  -- srun - refuse to run on malformed SPANK environment variable.
  -- Allow jobs to pack onto nodes already rebooting with the desired features.
+ -- Reset job start time after nodes are rebooted.
 
 * Changes in Slurm 21.08.5
 ==========================
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 76b20f99b2e1d315a7052325b49b62c04ed9ed73..7b2b66c014261687d98978cac25bad4ce9975195 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -28,6 +28,8 @@ HIGHLIGHTS
     the munge unit is no longer a dependency by default.
  -- Add extra 'EnvironmentFile=-/etc/default/$service' setting to service files.
  -- Allow jobs to pack onto nodes already rebooting with the desired features.
+ -- Reset job start time after nodes are rebooted, previously only done for
+    cloud/power save boots.
 
 CONFIGURATION FILE CHANGES (see man appropriate man page for details)
 =====================================================================
diff --git a/src/slurmctld/job_scheduler.c b/src/slurmctld/job_scheduler.c
index 80f7d543d11f697309f52ff3009d34d70e773287..18c3b4a3841a900f5e85b68e332162c1e93d78b6 100644
--- a/src/slurmctld/job_scheduler.c
+++ b/src/slurmctld/job_scheduler.c
@@ -4313,12 +4313,16 @@ extern int reboot_job_nodes(job_record_t *job_ptr)
 		if (boot_node_bitmap == NULL) {
 			if (bit_overlap_any(job_ptr->node_bitmap,
 					    booting_node_bitmap))
+				/* Reset job start time when nodes are booted */
+				job_ptr->job_state |= JOB_POWER_UP_NODE;
 				/* launch_job() when all nodes have booted */
 				job_ptr->bit_flags |= NODE_REBOOT;
 			return SLURM_SUCCESS;
 		}
 	}
 
+	/* Reset job start time when nodes are booted */
+	job_ptr->job_state |= JOB_POWER_UP_NODE;
 	/* launch_job() when all nodes have booted */
 	job_ptr->bit_flags |= NODE_REBOOT;