diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java
index fd3b5cf72b1f..b93ea1dc4896 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java
@@ -340,7 +340,7 @@ public class TaskManagerImpl extends TaskManager implements ProjectComponent, Pe
       if (createChangelist) {
         if (changeLists.isEmpty()) {
           String name = getChangelistName(origin);
-          String comment = TaskUtil.getChangeListComment(this, origin);
+          String comment = TaskUtil.getChangeListComment(origin);
           createChangeList(task, name, comment);
         } else {
           String id = changeLists.get(0).id;
@@ -368,7 +368,7 @@ public class TaskManagerImpl extends TaskManager implements ProjectComponent, Pe
   }
 
   public void createChangeList(LocalTask task, String name) {
-    String comment = TaskUtil.getChangeListComment(this, task);
+    String comment = TaskUtil.getChangeListComment(task);
     createChangeList(task, name, comment);
   }
 
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskUtil.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskUtil.java
index be50da7d9998..8a44e76d2716 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskUtil.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskUtil.java
@@ -33,23 +33,12 @@ public class TaskUtil {
   }
 
   @Nullable
-  public static String getChangeListComment(TaskManagerImpl manager, Task task) {
+  public static String getChangeListComment(Task task) {
     final TaskRepository repository = task.getRepository();
-    if (repository != null) {
-      return getChangeListComment(task, repository);
+    if (repository == null || !repository.isShouldFormatCommitMessage()) {
+      return null;
     }
-    for (TaskRepository repo : manager.getAllRepositories()) {
-      try {
-        final Task origin = repo.findTask(task.getId());
-        if (origin != null) return getChangeListComment(task, repo);
-      } catch (Exception ignored) {}
-    }
-    return null;
-  }
-
-  @Nullable
-  private static String getChangeListComment(Task task, TaskRepository repository) {
-    return repository.isShouldFormatCommitMessage() ? formatTask(task, repository.getCommitMessageFormat()) : null;
+    return formatTask(task, repository.getCommitMessageFormat());
   }
 
   public static String getTrimmedSummary(LocalTask task) {