diff --git a/src/backends/x11/meta-input-settings-x11.c b/src/backends/x11/meta-input-settings-x11.c
index 14a199e7e..d559c92a7 100644
--- a/src/backends/x11/meta-input-settings-x11.c
+++ b/src/backends/x11/meta-input-settings-x11.c
@@ -783,6 +783,9 @@ meta_input_settings_x11_set_stylus_button_map (MetaInputSettings          *setti
 
   /* Grab the puke bucket! */
   xdev = device_ensure_xdevice (device);
+
+  meta_x11_error_trap_push (display->x11_display);
+
   if (xdev)
     {
       guchar map[8] = {