diff --git a/platform/vcs-impl/src/com/intellij/vcs/commit/AbstractCommitMessagePolicy.kt b/platform/vcs-impl/src/com/intellij/vcs/commit/AbstractCommitMessagePolicy.kt
index d297fb400e76..a84cd4512972 100644
--- a/platform/vcs-impl/src/com/intellij/vcs/commit/AbstractCommitMessagePolicy.kt
+++ b/platform/vcs-impl/src/com/intellij/vcs/commit/AbstractCommitMessagePolicy.kt
@@ -102,19 +102,15 @@ abstract class AbstractCommitMessagePolicy(
     }
 
     fun getCommitMessageFromProvider(project: Project, changeList: LocalChangeList): CommitMessage? {
-      DefaultCommitMessagePolicy.EXTENSION_POINT_NAME.extensionList.forEach { provider ->
-        if (provider.enabled(project)) {
-          val message = provider.getMessage(project)
-          if (message != null) return message
-        }
+      val message = DefaultCommitMessagePolicy.EXTENSION_POINT_NAME.computeSafeIfAny { provider ->
+       if (provider.enabled(project)) provider.getMessage(project) else null
       }
+      if (message != null) return message
 
-      CommitMessageProvider.EXTENSION_POINT_NAME.extensionList.forEach { provider ->
+      return CommitMessageProvider.EXTENSION_POINT_NAME.computeSafeIfAny { provider ->
         val legacyProviderMessage = provider.getCommitMessage(changeList, project)
-        if (legacyProviderMessage != null) return CommitMessage(legacyProviderMessage)
+        if (legacyProviderMessage != null) CommitMessage(legacyProviderMessage) else null
       }
-
-      return null
     }
   }