diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/GradleConnectorService.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/GradleConnectorService.kt
index 301dd302c10c..250e9031fa11 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/GradleConnectorService.kt
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/GradleConnectorService.kt
@@ -90,14 +90,9 @@ class GradleConnectorService(@Suppress("UNUSED_PARAMETER") project: Project) : D
       workaroundJavaVersionIssueIfNeeded(newConnection, taskId, listener, cancellationToken)
 
       if (conn != null && connectorParams != conn.params) {
-        if (connectorParams.distributionType == DistributionType.WRAPPED && conn.params.distributionType == DistributionType.WRAPPED) {
-          val unwrappedConnection = conn.connection as WrappedConnection
-          unwrappedConnection.delegate.close()
-        }
-        else {
-          // release obsolete connection
-          conn.disconnect()
-        }
+        // close obsolete connection, can not disconnect the connector here - it may cause build cancel for the new connection operations
+        val unwrappedConnection = conn.connection as WrappedConnection
+        unwrappedConnection.delegate.close()
       }
       val wrappedConnection = WrappedConnection(newConnection)
       return@compute GradleProjectConnection(connectorParams, newConnector, wrappedConnection)