diff --git a/Xi/exevents.c b/Xi/exevents.c
index 90005f487..670d50983 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1717,8 +1717,6 @@ DeleteWindowFromAnyExtEvents(WindowPtr pWin, Bool freeResources)
     struct _OtherInputMasks *inputMasks;
 
     for (dev = inputInfo.devices; dev; dev = dev->next) {
-	if (dev == inputInfo.pointer || dev == inputInfo.keyboard)
-	    continue;
 	DeleteDeviceFromAnyExtEvents(pWin, dev);
     }