diff --git a/src/system/kernel/arch/x86/Jamfile b/src/system/kernel/arch/x86/Jamfile
index e95aa43e90..6fa9cea98d 100644
--- a/src/system/kernel/arch/x86/Jamfile
+++ b/src/system/kernel/arch/x86/Jamfile
@@ -54,7 +54,6 @@ if $(TARGET_ARCH) = x86_64 {
 		arch_user_debugger.cpp
 		ioapic.cpp
 		irq_routing_table.cpp
-		msi.cpp
 		syscall.S
 		x86_signals.cpp
 		x86_signals_asm.S
@@ -90,6 +89,7 @@ local archGenericSources =
 	arch_vm.cpp
 	arch_vm_translation_map.cpp
 	apic.cpp
+	msi.cpp
 	pic.cpp
 
 	# paging
diff --git a/src/system/kernel/arch/x86/arch_int.cpp b/src/system/kernel/arch/x86/arch_int.cpp
index 21dedb3a67..9d35513e0f 100644
--- a/src/system/kernel/arch/x86/arch_int.cpp
+++ b/src/system/kernel/arch/x86/arch_int.cpp
@@ -237,8 +237,8 @@ arch_int_init_io(kernel_args* args)
 	// TODO x86_64
 #ifndef __x86_64__
 	ioapic_init(args);
-	msi_init();
 #endif
+	msi_init();
 	return B_OK;
 }
 
diff --git a/src/system/kernel/arch/x86/msi.cpp b/src/system/kernel/arch/x86/msi.cpp
index 67b24225cc..62bfb84482 100644
--- a/src/system/kernel/arch/x86/msi.cpp
+++ b/src/system/kernel/arch/x86/msi.cpp
@@ -17,6 +17,10 @@ static bool sMSISupported = false;
 void
 msi_init()
 {
+#ifdef __x86_64__
+	// TODO x86_64.
+	return;
+#endif
 	if (!apic_available()) {
 		dprintf("disabling msi due to missing apic\n");
 		return;