diff --git a/src/mainboard/supermicro/x11-lga1151-series/Kconfig b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
index a3ed8af972..ea0214ad01 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/Kconfig
+++ b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
@@ -14,6 +14,7 @@ config BOARD_SUPERMICRO_BASEBOARD_X11_LGA1151_SERIES
 	select IPMI_KCS
 	select MAINBOARD_NO_FSP_GOP
 	select SUPERIO_ASPEED_HAS_UART_DELAY_WORKAROUND
+	select NO_FADT_8042
 
 if BOARD_SUPERMICRO_BASEBOARD_X11_LGA1151_SERIES
 
diff --git a/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-tf/overridetree.cb b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-tf/overridetree.cb
index 3e587dc817..aace4f7487 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-tf/overridetree.cb
+++ b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-tf/overridetree.cb
@@ -114,12 +114,7 @@ chip soc/intel/skylake
 							io 0x66 = 0xa30
 							irq 0x70 = 0xb
 						end
-						device pnp 2e.5 on	# Keyboard
-							io 0x60 = 0x60
-							io 0x62 = 0x64
-							irq 0x70 = 1
-							irq 0x72 = 0xc
-						end
+						device pnp 2e.5 off end	# KBC
 						device pnp 2e.7 on end	# GPIO
 						device pnp 2e.b on	# SUART3
 							io 0x60 = 0x3e8