diff --git a/dix/devices.c b/dix/devices.c
index d0e99bd62..012550443 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -432,8 +432,6 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
     if (*prev != dev)
         return FALSE;
 
-    ReleaseButtonsAndKeys(dev);
-
     /* float attached devices */
     if (IsMaster(dev)) {
         for (other = inputInfo.devices; other; other = other->next) {