diff --git a/xpra/x11/server_keyboard_config.py b/xpra/x11/server_keyboard_config.py
index 7a4da95905..0136928282 100644
--- a/xpra/x11/server_keyboard_config.py
+++ b/xpra/x11/server_keyboard_config.py
@@ -473,8 +473,8 @@ def do_get_keycode(self, client_keycode:int, keyname:str, pressed:bool, modifier
             return -1, group
         if self.raw:
             return client_keycode, group
-        keycode = self.keycode_translation.get((client_keycode, keyname), 0)
-        if keycode:
+        if self.query_struct:
+            keycode = self.keycode_translation.get((client_keycode, keyname)) or client_keycode
             self.kmlog(keyname, "do_get_keycode (%i, %s)=%s (native keymap)", client_keycode, keyname, keycode)
             return keycode, group
         return self.find_matching_keycode(client_keycode, keyname, pressed, modifiers, keyval, keystr, group)