diff --git a/src/kernal/board_x16/cx16_stubs.s b/src/kernal/board_x16/cx16_stubs.s
index da530dd6..2407b0e5 100644
--- a/src/kernal/board_x16/cx16_stubs.s
+++ b/src/kernal/board_x16/cx16_stubs.s
@@ -39,6 +39,3 @@ setup_pal_ntsc:
 
 wait_x_bars:
 	STUB_IMPLEMENTATION()
-
-udtim_keyboard:
-	STUB_IMPLEMENTATION()
diff --git a/src/kernal/time/udtim.s b/src/kernal/time/udtim.s
index 94b3fff4..2fafdf53 100644
--- a/src/kernal/time/udtim.s
+++ b/src/kernal/time/udtim.s
@@ -51,6 +51,12 @@ udtim_clock_reset:
 
 udtim_keyboard:
 
+#if CONFIG_PLATFORM_COMMANDER_X16
+
+	STUB_IMPLEMENTATION()
+
+#else
+
 	// According to [CM64], page 27, the action we have to perform is to copy
 	// the last row of keyboard to RAM, so that various routines can detect the STOP
 	// key press. But something as simple as this would have created warm restart
@@ -93,3 +99,5 @@ udtim_keyboard:
 	// unable to, for example, read the space bar status.
 
 	rts
+
+#endif