diff --git a/plugins/settings-repository/lib/jgit-sources.jar b/plugins/settings-repository/lib/jgit-sources.jar
index 54759b8a6c97..6787f763df47 100644
Binary files a/plugins/settings-repository/lib/jgit-sources.jar and b/plugins/settings-repository/lib/jgit-sources.jar differ
diff --git a/plugins/settings-repository/lib/jgit.jar b/plugins/settings-repository/lib/jgit.jar
index 94b3731894eb..befb823296cd 100644
Binary files a/plugins/settings-repository/lib/jgit.jar and b/plugins/settings-repository/lib/jgit.jar differ
diff --git a/plugins/settings-repository/src/git/GitRepositoryManager.kt b/plugins/settings-repository/src/git/GitRepositoryManager.kt
index 38cfe1eae5ca..30095a513f13 100644
--- a/plugins/settings-repository/src/git/GitRepositoryManager.kt
+++ b/plugins/settings-repository/src/git/GitRepositoryManager.kt
@@ -193,6 +193,9 @@ class GitRepositoryManager(private val credentialsStore: Lazy<IcsCredentialsStor
               throw AuthenticationException(e)
             }
           }
+          else if (e.status == TransportException.Status.BAD_GATEWAY) {
+            continue
+          }
           else {
             wrapIfNeedAndReThrow(e)
           }