diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/PermanentGraphImpl.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/PermanentGraphImpl.java
index ec2097097795..3cdf856ef826 100644
--- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/PermanentGraphImpl.java
+++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/PermanentGraphImpl.java
@@ -112,24 +112,25 @@ public class PermanentGraphImpl<CommitId> implements PermanentGraph<CommitId>, P
   private LinearGraphController createFilteredController(@NotNull LinearGraphController baseController,
                                                          @NotNull SortType sortType,
                                                          @Nullable Set<CommitId> visibleHeads, @Nullable Set<CommitId> matchingCommits) {
-    LinearGraphController controller;
+    Set<Integer> visibleHeadsIds = visibleHeads != null ? myPermanentCommitsInfo.convertToNodeIds(visibleHeads, true) : null;
     if (matchingCommits != null) {
-      controller = new FilteredController(baseController, this, myPermanentCommitsInfo.convertToNodeIds(matchingCommits));
-      if (visibleHeads != null) {
-        return new BranchFilterController(controller, this, myPermanentCommitsInfo.convertToNodeIds(visibleHeads, true));
+      LinearGraphController controller =
+        new FilteredController(baseController, this, myPermanentCommitsInfo.convertToNodeIds(matchingCommits));
+      if (visibleHeadsIds != null) {
+        return new BranchFilterController(controller, this, visibleHeadsIds);
       }
       return controller;
     }
 
     if (sortType == SortType.LinearBek) {
-      if (visibleHeads != null) {
-        return new BranchFilterController(baseController, this, myPermanentCommitsInfo.convertToNodeIds(visibleHeads, true));
+      if (visibleHeadsIds != null) {
+        return new BranchFilterController(baseController, this, visibleHeadsIds);
       }
       return baseController;
     }
 
-    if (visibleHeads != null) {
-      return new CollapsedController(baseController, this, myPermanentCommitsInfo.convertToNodeIds(visibleHeads, true));
+    if (visibleHeadsIds != null) {
+      return new CollapsedController(baseController, this, visibleHeadsIds);
     }
     return new CollapsedController(baseController, this, null);
   }