diff --git a/src/platform/intel/cavs/platform.c b/src/platform/intel/cavs/platform.c
index e9ef09900295..2f4602b4c222 100644
--- a/src/platform/intel/cavs/platform.c
+++ b/src/platform/intel/cavs/platform.c
@@ -102,6 +102,10 @@ int platform_boot_complete(uint32_t boot_message)
 	return 0;
 }
 
+static struct pm_notifier pm_state_notifier = {
+	.state_exit = cpu_notify_state_exit,
+};
+
 /* Runs on the primary core only */
 int platform_init(struct sof *sof)
 {
@@ -150,6 +154,9 @@ int platform_init(struct sof *sof)
 	if (ret < 0)
 		return ret;
 
+	/* register power states exit notifiers */
+	pm_notifier_register(&pm_state_notifier);
+
 	/* initialize the host IPC mechanisms */
 	trace_point(TRACE_BOOT_PLATFORM_IPC);
 	ipc_init(sof);
diff --git a/zephyr/lib/cpu.c b/zephyr/lib/cpu.c
index d630177bdde2..3dde19dc38bc 100644
--- a/zephyr/lib/cpu.c
+++ b/zephyr/lib/cpu.c
@@ -148,8 +148,7 @@ int cpu_enable_core(int id)
 	 * initialization. By reinitializing the idle thread, we would overwrite the kernel structs
 	 * and the idle thread stack.
 	 */
-	if (!IS_ENABLED(CONFIG_ADSP_IMR_CONTEXT_SAVE) ||
-	    pm_state_next_get(id)->state == PM_STATE_ACTIVE)
+	if (pm_state_next_get(id)->state == PM_STATE_ACTIVE)
 		z_init_cpu(id);
 #endif