diff --git a/src/wayland/meta-xwayland-selection.c b/src/wayland/meta-xwayland-selection.c
index 2b40d8c65..d7a5e69c1 100644
--- a/src/wayland/meta-xwayland-selection.c
+++ b/src/wayland/meta-xwayland-selection.c
@@ -847,10 +847,10 @@ meta_selection_bridge_ownership_notify (struct wl_listener *listener,
 
   if (!owner && selection->window == selection->owner)
     {
-        XSetSelectionOwner (xdisplay, selection->selection_atom,
-                            None, selection->timestamp);
+      XSetSelectionOwner (xdisplay, selection->selection_atom,
+                          None, selection->timestamp);
     }
-  else if (selection->source != owner)
+  else if (owner && selection->source != owner)
     {
       XSetSelectionOwner (xdisplay,
                           selection->selection_atom,