diff --git a/plugins/clipboard/msd-clipboard-manager.c b/plugins/clipboard/msd-clipboard-manager.c
index 403195831..8a032eb17 100644
--- a/plugins/clipboard/msd-clipboard-manager.c
+++ b/plugins/clipboard/msd-clipboard-manager.c
@@ -436,10 +436,10 @@ convert_clipboard_manager (MsdClipboardManager *manager,
                         if (display && gdk_x11_display_error_trap_pop (display) != Success)
                                 return;
 
-                        if (display)
-                                gdk_x11_display_error_trap_push (display);
-
                         if (xev->xselectionrequest.property != None) {
+                                if (display)
+                                        gdk_x11_display_error_trap_push (display);
+
                                 XGetWindowProperty (manager->priv->display,
                                                     xev->xselectionrequest.requestor,
                                                     xev->xselectionrequest.property,