diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 75c72fa9080297a7741156ff524803944e4870dd..3ce2c817c26ae7ecabaef4c86790c1efd13f434f 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -393,6 +393,9 @@ int irq_setup_affinity(struct irq_desc *desc)
 	}
 
 	cpumask_and(&mask, cpu_online_mask, set);
+	if (cpumask_empty(&mask))
+		cpumask_copy(&mask, cpu_online_mask);
+
 	if (node != NUMA_NO_NODE) {
 		const struct cpumask *nodemask = cpumask_of_node(node);