diff --git a/0001-main-Leak-the-GJS-context-and-ShellGlobal.patch b/0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
new file mode 100644
index 0000000..bd5146e
--- /dev/null
+++ b/0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
@@ -0,0 +1,31 @@
+From 9a0ecad2b94243fbed5290f78d967d8714c3d3e4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
+Date: Wed, 6 Oct 2021 10:00:43 +0200
+Subject: [PATCH] main: Leak the GJS context and ShellGlobal
+
+There are many crash-on-exit happening as a side effect of destroying
+the GJS context. Work around these until we have a better solution by
+leaking them.
+---
+ src/main.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/main.c b/src/main.c
+index 3cd9e10a5b..ce56e2a87a 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -570,9 +570,11 @@ main (int argc, char **argv)
+ 
+   shell_profiler_shutdown ();
+ 
++#if 0
+   g_debug ("Doing final cleanup");
+   _shell_global_destroy_gjs_context (shell_global_get ());
+   g_object_unref (shell_global_get ());
++#endif
+ 
+   return ecode;
+ }
+-- 
+2.31.1
+
diff --git a/gnome-shell.spec b/gnome-shell.spec
index 1277164..8228ead 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -2,7 +2,7 @@
 
 Name:           gnome-shell
 Version:        41.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Window management and application launching for GNOME
 
 License:        GPLv2+
@@ -33,6 +33,9 @@ Patch50001: 0001-st-password-entry-Fix-crash-when-DConf-changes-after.patch
 Patch60001: 0001-unlockDialog-Don-t-create-AuthDialog-just-to-finish-.patch
 Patch60002: 0002-unlockDialog-Properly-reset-auth-prompt-when-showing.patch
 
+# Work around crashy tear down
+Patch60003: 0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
+
 %define eds_version 3.33.1
 %define gnome_desktop_version 3.35.91
 %define glib2_version 2.56.0
@@ -246,6 +249,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
 %{_mandir}/man1/gnome-shell.1*
 
 %changelog
+* Tue Oct 26 2021 Jonas Ådahl <jadahl@redhat.com> - 41.0-6
+- Work around crashy tear down
+
 * Tue Oct 26 2021 Ray Strode <rstrode@redhat.com> - 41.0-5
 - Fix unlock screen confusion when hitting escape too much