diff --git a/guacamole-common-js/src/main/webapp/modules/Keyboard.js b/guacamole-common-js/src/main/webapp/modules/Keyboard.js
index 9a93864cb..42617d6d5 100644
--- a/guacamole-common-js/src/main/webapp/modules/Keyboard.js
+++ b/guacamole-common-js/src/main/webapp/modules/Keyboard.js
@@ -933,13 +933,18 @@ Guacamole.Keyboard = function(element) {
         // Keyup event
         else if (first instanceof KeyupEvent) {
 
+            // Release specific key if known
             var keysym = first.keysym;
             if (keysym) {
                 guac_keyboard.release(keysym);
                 first.defaultPrevented = true;
             }
-            else
+
+            // Otherwise, fall back to releasing all keys
+            else {
                 guac_keyboard.reset();
+                return first;
+            }
 
             return eventLog.shift();