diff --git a/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp b/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
index 2c640476ff..0a91ac7940 100644
--- a/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
+++ b/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
@@ -13,6 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <apic.h>
 #include <ACPI.h>
 #include <dpc.h>
 #include <KernelExport.h>
@@ -37,6 +38,9 @@ extern "C" {
 
 #define ERROR(x...) dprintf("acpi: " x)
 
+#define PIC_MODE 0;
+#define APIC_MODE 1;
+
 #define ACPI_DEVICE_ID_LENGTH	0x08
 
 extern pci_module_info* gPCIManager;
@@ -241,7 +245,7 @@ acpi_std_ops(int32 op,...)
 				goto err;
 
 			arg.Integer.Type = ACPI_TYPE_INTEGER;
-			arg.Integer.Value = 0;
+			arg.Integer.Value = apic_available() ? APIC_MODE : PIC_MODE;
 
 			parameter.Count = 1;
 			parameter.Pointer = &arg;