diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp
index 52be1bdfb3..611d6c5424 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp
@@ -149,11 +149,11 @@ ps2_service_thread(void *arg)
 static int
 ps2_republish(int argc, char **argv)
 {
-	int dev = 4;
+	int dev = PS2_DEVICE_KEYB;
 	if (argc == 2)
 		dev = strtoul(argv[1], NULL, 0);
-	if (dev < 0 || dev > 4)
-		dev = 4;
+	if (dev < 0 || dev >= PS2_DEVICE_COUNT)
+		dev = PS2_DEVICE_KEYB;
 	ps2_service_notify_device_republish(&ps2_device[dev]);
 	return 0;
 }