diff --git a/kernel/irq/cpuhotplug.c b/kernel/irq/cpuhotplug.c
index ef18c39f78c1..d995601d04e8 100644
--- a/kernel/irq/cpuhotplug.c
+++ b/kernel/irq/cpuhotplug.c
@@ -116,6 +116,8 @@ static bool migrate_one_irq(struct irq_desc *desc)
 	affinity = &available_cpus;
 
 	if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids) {
+		const struct cpumask *default_affinity;
+
 		/*
 		 * If the interrupt is managed, then shut it down and leave
 		 * the affinity untouched.
@@ -125,6 +127,8 @@ static bool migrate_one_irq(struct irq_desc *desc)
 			irq_shutdown_and_deactivate(desc);
 			return false;
 		}
+
+		default_affinity = desc->affinity_hint ? : irq_default_affinity;
 		/*
 		 * The order of preference for selecting a fallback CPU is
 		 *
@@ -134,9 +138,9 @@ static bool migrate_one_irq(struct irq_desc *desc)
 		 */
 		cpumask_andnot(&available_cpus, cpu_online_mask,
 							cpu_isolated_mask);
-		if (cpumask_intersects(&available_cpus, irq_default_affinity))
+		if (cpumask_intersects(&available_cpus, default_affinity))
 			cpumask_and(&available_cpus, &available_cpus,
-							irq_default_affinity);
+							default_affinity);
 		else if (cpumask_empty(&available_cpus))
 			affinity = cpu_online_mask;