diff --git a/repos/os/src/drivers/platform/spec/x86/irq.cc b/repos/os/src/drivers/platform/spec/x86/irq.cc
index 1b7103bd50..1853236d99 100644
--- a/repos/os/src/drivers/platform/spec/x86/irq.cc
+++ b/repos/os/src/drivers/platform/spec/x86/irq.cc
@@ -193,10 +193,6 @@ Platform::Irq_session_component::Irq_session_component(unsigned irq,
 :
 	_gsi(irq)
 {
-	/* invalid irq number for pci_devices */
-	if (_gsi >= INVALID_IRQ)
-		return;
-
 	if (pci_config_space != ~0UL) {
 		/* msi way */
 		unsigned msi = irq_alloc.alloc_msi();
@@ -219,6 +215,10 @@ Platform::Irq_session_component::Irq_session_component(unsigned irq,
 		}
 	}
 
+	/* invalid irq number for pci_devices */
+	if (_gsi >= INVALID_IRQ)
+		return;
+
 	Genode::Irq_session::Trigger  trigger;
 	Genode::Irq_session::Polarity polarity;