diff --git a/fix-critical.patch b/fix-critical.patch
new file mode 100644
index 0000000..68bf3fb
--- /dev/null
+++ b/fix-critical.patch
@@ -0,0 +1,34 @@
+From 8f04d4db50f29420022f11a48b5ecf132058c2f3 Mon Sep 17 00:00:00 2001
+From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+Date: Fri, 14 Feb 2014 12:12:54 +0100
+Subject: [PATCH] idle-connection: make sure to always reset
+ force_disconnect_id
+
+Recent GLib raises a critical when trying to remove an invalid source.
+---
+ src/idle-connection.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/idle-connection.c b/src/idle-connection.c
+index 6ab5fea..8614d52 100644
+--- a/src/idle-connection.c
++++ b/src/idle-connection.c
+@@ -585,6 +585,7 @@ static gboolean _finish_shutdown_idle_func(gpointer data) {
+ 	IdleConnectionPrivate *priv = self->priv;
+ 	if (priv->force_disconnect_id != 0) {
+ 		g_source_remove(priv->force_disconnect_id);
++		priv->force_disconnect_id = 0;
+ 	}
+ 
+ 	tp_base_connection_finish_shutdown(conn);
+@@ -600,6 +601,7 @@ _force_disconnect (gpointer data)
+ 
+ 	IDLE_DEBUG("gave up waiting, forcibly disconnecting");
+ 	idle_server_connection_force_disconnect(priv->conn);
++	priv->force_disconnect_id = 0;
+ 	return FALSE;
+ }
+ 
+-- 
+GitLab
+
diff --git a/telepathy-idle.spec b/telepathy-idle.spec
index 29f860a..22e9df8 100644
--- a/telepathy-idle.spec
+++ b/telepathy-idle.spec
@@ -7,7 +7,7 @@
 
 Name:           telepathy-idle
 Version:        0.2.0
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        IRC connection manager for Telepathy
 
 License:        LGPLv2+
@@ -35,6 +35,8 @@ Patch0: 0001-tools-Fix-errors-running-glib-ginterface-gen-under-P.patch
 Patch1: 0002-tools-Remove-outdated-is-unicode-checks.patch
 # https://gitlab.freedesktop.org/telepathy/telepathy-idle/-/merge_requests/3
 Patch2: properly-handle-long-irc-messages.patch
+# https://gitlab.freedesktop.org/telepathy/telepathy-idle/-/merge_requests/2
+Patch3: fix-critical.patch
 
 %description
 A full-featured IRC connection manager for the Telepathy project.
@@ -69,6 +71,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 13 2020 Kalev Lember <klember@redhat.com> - 0.2.0-20
+- Backport mcatanzaro patch to fix criticals when removing idle sources
+
 * Fri Oct 09 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.2.0-20
 - Correct upstream URL