diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp
index d4a36cd4f6..b474a13d3e 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_keyboard.cpp
@@ -388,14 +388,14 @@ keyboard_close(void *_cookie)
 
 		atomic_and(&ps2_device[PS2_DEVICE_KEYB].flags, ~PS2_FLAG_ENABLED);
 
-		if (cookie->is_reader)
-			sHasKeyboardReader = false;
-		if (cookie->is_debugger)
-			sHasDebugReader = false;
-
 		sKeyboardIds[0] = sKeyboardIds[1] = 0;
 	}
 
+	if (cookie->is_reader)
+		sHasKeyboardReader = false;
+	if (cookie->is_debugger) {
+		sHasDebugReader = false;
+
 	TRACE("ps2: keyboard_close done\n");
 	return B_OK;
 }