diff --git a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
index 45fb95c917..50d89b809f 100644
--- a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
+++ b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
@@ -802,7 +802,7 @@ KeyboardInputDevice::_DeviceWatcher(void *arg)
 			activeDeadKey = newDeadKey;
 		}
 
-		lastKeyCode = keycode;
+		lastKeyCode = isKeyDown ? keycode : 0;
 	}
 
 	return 0;