diff --git a/SOURCES/gnome-software-3.36.1-unrelated-refs.patch b/SOURCES/gnome-software-3.36.1-unrelated-refs.patch
new file mode 100644
index 0000000..a63d2d2
--- /dev/null
+++ b/SOURCES/gnome-software-3.36.1-unrelated-refs.patch
@@ -0,0 +1,26 @@
+diff -up gnome-software-3.36.1/plugins/flatpak/gs-plugin-flatpak.c.unrelated-refs gnome-software-3.36.1/plugins/flatpak/gs-plugin-flatpak.c
+--- gnome-software-3.36.1/plugins/flatpak/gs-plugin-flatpak.c.unrelated-refs	2020-10-09 14:07:16.407235531 -0400
++++ gnome-software-3.36.1/plugins/flatpak/gs-plugin-flatpak.c	2020-10-09 14:08:48.775544689 -0400
+@@ -696,6 +696,11 @@ gs_plugin_app_remove (GsPlugin *plugin,
+ 		gs_flatpak_error_convert (error);
+ 		return FALSE;
+ 	}
++
++	/* add to the transaction cache for quick look up -- other unrelated
++	 * refs will be matched using gs_plugin_flatpak_find_app_by_ref() */
++	gs_flatpak_transaction_add_app (transaction, app);
++
+ 	ref = gs_flatpak_app_get_ref_display (app);
+ 	if (!flatpak_transaction_add_uninstall (transaction, ref, error)) {
+ 		gs_flatpak_error_convert (error);
+@@ -899,6 +904,10 @@ gs_plugin_flatpak_update (GsPlugin *plug
+ 			gs_flatpak_error_convert (error);
+ 			return FALSE;
+ 		}
++
++		/* add to the transaction cache for quick look up -- other unrelated
++		 * refs will be matched using gs_plugin_flatpak_find_app_by_ref() */
++		gs_flatpak_transaction_add_app (transaction, app);
+ 	}
+ 
+ 	/* run transaction */
diff --git a/SPECS/gnome-software.spec b/SPECS/gnome-software.spec
index d6742f6..56a923e 100644
--- a/SPECS/gnome-software.spec
+++ b/SPECS/gnome-software.spec
@@ -14,7 +14,7 @@
 
 Name:      gnome-software
 Version:   3.36.1
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   A software center for GNOME
 
 License:   GPLv2+
@@ -32,6 +32,8 @@ Patch2:    add-back-shell-extensions-support.patch
 Patch3:    0001-Fix-hardcoded-desktop-and-appdata-names-to-match-wha.patch
 # Fix 'Show Details' to correctly work for rpm-installed firefox
 Patch4:    0001-Improve-the-heuristic-for-detecting-old-style-AppStr.patch
+# Fix flatpak updates and removals when same ref occurs in multiple remotes
+Patch5:    gnome-software-3.36.1-unrelated-refs.patch
 
 BuildRequires: gcc
 BuildRequires: gettext
@@ -219,6 +221,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/gtk-doc/html/gnome-software
 
 %changelog
+* Wed Feb 17 2021 Milan Crha <mcrha@redhat.com> - 3.36.1-5
+- Fix flatpak updates and removals when same ref occurs in multiple remotes
+- Resolves: #1888407
+
 * Thu Jun 11 2020 Kalev Lember <klember@redhat.com> - 3.36.1-4
 - Fix 'Show Details' to correctly work for rpm-installed firefox
 - Resolves: #1845714