diff --git a/SOURCES/0001-local-display-factory-pause-for-a-few-seconds-before.patch b/SOURCES/0001-local-display-factory-pause-for-a-few-seconds-before.patch
index 3174d90..ed5c469 100644
--- a/SOURCES/0001-local-display-factory-pause-for-a-few-seconds-before.patch
+++ b/SOURCES/0001-local-display-factory-pause-for-a-few-seconds-before.patch
@@ -40,6 +40,11 @@ index 8a4ef06cd..8554a0442 100644
                  if (factory->num_failures > 0 || !gdm_local_display_factory_use_wayland ()) {
                          session_type = NULL;
                          g_debug ("GdmLocalDisplayFactory: New displays on seat0 will use X11 fallback");
++
++                        /* workaround logind race for now
++                         * bug 1643874
++                         */
++                        g_usleep (2 * G_USEC_PER_SEC);
                  } else {
                          g_debug ("GdmLocalDisplayFactory: New displays on seat0 will use wayland");
                  }
@@ -50,11 +55,6 @@ index 8a4ef06cd..8554a0442 100644
                  /* Force legacy X11 for all auxiliary seats */
                  seat_supports_graphics = TRUE;
                  session_type = NULL;
-+
-+                                        /* workaround logind race for now
-+                                         * bug 1643874
-+                                         */
-+                                        g_usleep (2 * G_USEC_PER_SEC);
          }
  
          /* For seat0, we have a fallback logic to still try starting it after
diff --git a/SPECS/gdm.spec b/SPECS/gdm.spec
index f560d74..19a733b 100644
--- a/SPECS/gdm.spec
+++ b/SPECS/gdm.spec
@@ -12,7 +12,7 @@
 Name: gdm
 Epoch: 1
 Version: 40.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The GNOME Display Manager
 
 License: GPLv2+
@@ -354,6 +354,10 @@ fi
 %{_libdir}/pkgconfig/gdm-pam-extensions.pc
 
 %changelog
+* Wed May 19 2021 Ray Strode <rstrode@redhat.com> - 40.0-2
+- Fix workaround for systemd bug that's breaking X11 fallback
+  Resolves: #1962049
+
 * Wed May 05 2021 Ray Strode <rstrode@redhat.com> - 40.0-1
 - Rebase to 40.0
   Resolves: #1909300