diff --git a/build.gradle b/build.gradle
index 14f5994eef..3971bfd7b7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ buildscript {
 	ext.kotlinVersion = '1.3.72'
 	repositories {
 		maven { url 'https://plugins.gradle.org/m2' }
-		maven { url 'https://repo.spring.io/plugins-release' }
+		maven { url 'https://repo.spring.io/plugins-release-local' }
 	}
 	dependencies {
 		classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-beta.5'
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitUtils.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitUtils.java
index d44c6f81e5..c64d65663c 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitUtils.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitUtils.java
@@ -229,12 +229,18 @@ public static void setPhysicalCloseRequired(Channel channel, boolean b) {
 	public static boolean isPhysicalCloseRequired() {
 		Boolean mustClose = physicalCloseRequired.get();
 		if (mustClose == null) {
-			mustClose = Boolean.FALSE;
+			return false;
 		}
 		else {
-			physicalCloseRequired.remove();
+			return mustClose;
 		}
-		return mustClose;
+	}
+
+	/**
+	 * Clear the physicalCloseRequired flag.
+	 */
+	public static void clearPhysicalCloseRequired() {
+		physicalCloseRequired.remove();
 	}
 
 	/**