diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 8661cae2..a578285d 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -927,7 +927,11 @@ public void SetBranchFilterMode(BranchTreeNode node, Models.FilterMode mode, boo
                     return;
 
                 if (isLocal && !string.IsNullOrEmpty(branch.Upstream))
-                    _settings.UpdateHistoriesFilter(branch.Upstream, Models.FilterType.RemoteBranch, mode);
+                {
+                    var upstreamNode = FindBranchNode(_remoteBranchTrees, branch.Upstream);
+                    if (upstreamNode != null)
+                        _settings.UpdateHistoriesFilter(branch.Upstream, Models.FilterType.RemoteBranch, mode);
+                }
             }
             else
             {