diff --git a/src/xterm.c b/src/xterm.c
index a40440e0dad..e50c1d4bbbf 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -27654,6 +27654,8 @@ xi_select_hierarchy_events (struct x_display_info *dpyinfo)
   memset (m, 0, l);
   mask.mask_len = l;
 
+  mask.deviceid = XIAllDevice;
+
   XISetMask (m, XI_PropertyEvent);
   XISetMask (m, XI_HierarchyChanged);
   XISetMask (m, XI_DeviceChanged);