diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c
--- a/sys/dev/atkbdc/atkbd.c
+++ b/sys/dev/atkbdc/atkbd.c
@@ -1256,7 +1256,8 @@
 
 	/* see if something is present */
 	write_kbd_command(kbdc, KBDC_ECHO);
-	if (read_kbd_data(kbdc) != KBD_ECHO) {
+	if (read_kbd_data(kbdc) != KBD_ACK ||
+	    read_kbd_data(kbdc) != KBD_ECHO) {
 		empty_both_buffers(kbdc, 10);
 		test_controller(kbdc);
 		test_kbd_port(kbdc);