diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index 791c07794..fec8662cc 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -743,6 +743,9 @@ meta_xwayland_init (MetaXWaylandManager *manager,
     {
       if (!choose_xdisplay (manager))
         return FALSE;
+
+      if (!prepare_auth_file (manager))
+        return FALSE;
     }
   else
     {
@@ -750,9 +753,6 @@ meta_xwayland_init (MetaXWaylandManager *manager,
         return FALSE;
     }
 
-  if (!prepare_auth_file (manager))
-    return FALSE;
-
   manager->wayland_display = wl_display;
   policy = meta_get_x11_display_policy ();