diff --git a/src/ec/starlabs/merlin/acpi/dock.asl b/src/ec/starlabs/merlin/acpi/dock.asl
index 8d648bc8b9..dd234f160b 100644
--- a/src/ec/starlabs/merlin/acpi/dock.asl
+++ b/src/ec/starlabs/merlin/acpi/dock.asl
@@ -31,12 +31,10 @@ Device (VBTN)
 
 	Method (VGBS, 0)
 	{
-#if CONFIG(SYSTEM_TYPE_DETACHABLE)
 		If (!GRXS (GPP_F15))
 		{
 			Return (0x40)
 		}
-#endif
 		Return (0x00)
 	}
 }
diff --git a/src/ec/starlabs/merlin/acpi/ec.asl b/src/ec/starlabs/merlin/acpi/ec.asl
index 35604840cb..f3fdb07334 100644
--- a/src/ec/starlabs/merlin/acpi/ec.asl
+++ b/src/ec/starlabs/merlin/acpi/ec.asl
@@ -117,7 +117,9 @@ Scope (\_SB.PCI0.LPCB)
 		#include "events.asl"
 #endif
 		#include "lid.asl"
+#if CONFIG(SYSTEM_TYPE_DETACHABLE)
 		#include "dock.asl"
+#endif
 
 		Method (_REG, 2, NotSerialized)
 		{
diff --git a/src/ec/starlabs/merlin/acpi/hid.asl b/src/ec/starlabs/merlin/acpi/hid.asl
index f3bfff611e..a63723916e 100644
--- a/src/ec/starlabs/merlin/acpi/hid.asl
+++ b/src/ec/starlabs/merlin/acpi/hid.asl
@@ -366,7 +366,11 @@ Device (HIDD)							// HID Device
 					//
 					Case (0x08)
 					{
+#if CONFIG(SYSTEM_TYPE_DETACHABLE)
 						Return (\_SB.PCI0.LPCB.EC.VBTN.VGBS())
+#else
+						Return (0x00)
+#endif
 					}
 					//
 					// Function 9 H2BC. Button implemented state.