diff --git a/RELEASE.md b/RELEASE.md
index 8aaaad8..8c136a5 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -31,3 +31,4 @@ It does help this project on being supported.
 - Fix delay in X360Rumble: Do not send repeated haptic if disabled
 - Fix `AccessDenied` in Steam Detection
 - Properly apply X360 mappings for Back Panel keys
+- Setting `Keyboard[KEY] = false` and `Mouse[KEY] = false` does not cancel the press
diff --git a/SteamController/Devices/KeyboardController.cs b/SteamController/Devices/KeyboardController.cs
index 442d9f8..72bf706 100644
--- a/SteamController/Devices/KeyboardController.cs
+++ b/SteamController/Devices/KeyboardController.cs
@@ -36,10 +36,6 @@ namespace SteamController.Devices
                     var keyRepeat = lastKeyCodes.GetValueOrDefault(button) ?? new KeyRepeats(DateTime.Now.Add(FirstRepeat), 0);
                     keyCodes.Add(button, keyRepeat);
                 }
-                else
-                {
-                    keyCodes.Remove(button);
-                }
             }
         }
 
diff --git a/SteamController/Devices/MouseController.cs b/SteamController/Devices/MouseController.cs
index 0f46ddb..09ec081 100644
--- a/SteamController/Devices/MouseController.cs
+++ b/SteamController/Devices/MouseController.cs
@@ -65,8 +65,6 @@ namespace SteamController.Devices
             {
                 if (value)
                     mouseButtons.Add(button);
-                else
-                    mouseButtons.Remove(button);
             }
         }