diff --git a/headers/private/system/safemode_defs.h b/headers/private/system/safemode_defs.h
index e5d5a3ea6a..33f1dd01cc 100644
--- a/headers/private/system/safemode_defs.h
+++ b/headers/private/system/safemode_defs.h
@@ -21,7 +21,4 @@
 #	define B_SAFEMODE_DISABLE_LATENCY_CHECK	"disable_latency_check"
 #endif
 
-#define B_SAFEMODE_ENABLE_IOAPIC			"enable_ioapic"
-	// TODO: temprary opt-in, can be removed once IO-APIC code is broadly tested
-
 #endif	/* _SYSTEM_SAFEMODE_DEFS_H */
diff --git a/src/system/boot/platform/bios_ia32/smp.cpp b/src/system/boot/platform/bios_ia32/smp.cpp
index 28f1bbbbb2..0cab2a07d8 100644
--- a/src/system/boot/platform/bios_ia32/smp.cpp
+++ b/src/system/boot/platform/bios_ia32/smp.cpp
@@ -578,19 +578,11 @@ smp_add_safemode_menus(Menu *menu)
 	MenuItem *item;
 
 	if (gKernelArgs.arch_args.ioapic_phys != 0) {
-#if 0
 		menu->AddItem(item = new(nothrow) MenuItem("Disable IO-APIC"));
 		item->SetType(MENU_ITEM_MARKABLE);
 		item->SetData(B_SAFEMODE_DISABLE_IOAPIC);
 		item->SetHelpText("Disables using the IO APIC for interrupt routing, "
 			"forcing the use of the legacy PIC instead.");
-#else
-		// TODO: This can be removed once IO-APIC code is broadly tested
-		menu->AddItem(item = new(nothrow) MenuItem("Enable IO-APIC"));
-		item->SetType(MENU_ITEM_MARKABLE);
-		item->SetData(B_SAFEMODE_ENABLE_IOAPIC);
-		item->SetHelpText("Enables using the IO APIC for interrupt routing.");
-#endif
 	}
 
 	if (gKernelArgs.arch_args.apic_phys != 0) {
diff --git a/src/system/kernel/arch/x86/ioapic.cpp b/src/system/kernel/arch/x86/ioapic.cpp
index 6b65b006c2..2ceb8808ef 100644
--- a/src/system/kernel/arch/x86/ioapic.cpp
+++ b/src/system/kernel/arch/x86/ioapic.cpp
@@ -538,20 +538,11 @@ ioapic_init(kernel_args* args)
 		return;
 	}
 
-#if 0
 	if (get_safemode_boolean(B_SAFEMODE_DISABLE_IOAPIC, false)) {
 		dprintf("io-apics explicitly disabled, not using io-apics for "
 			"interrupt routing\n");
 		return;
 	}
-#else
-	// TODO: This can be removed once IO-APIC code is broadly tested
-	if (!get_safemode_boolean(B_SAFEMODE_ENABLE_IOAPIC, false)) {
-		dprintf("io-apics not enabled, not using io-apics for interrupt "
-			"routing\n");
-		return;
-	}
-#endif
 
 	// load acpi module
 	status_t status;