diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/annotation/MultiRabbitBootstrapConfiguration.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/annotation/MultiRabbitBootstrapConfiguration.java
index eca137cdb3..cfc127cb16 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/annotation/MultiRabbitBootstrapConfiguration.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/annotation/MultiRabbitBootstrapConfiguration.java
@@ -17,7 +17,6 @@
 package org.springframework.amqp.rabbit.annotation;
 
 import org.springframework.amqp.rabbit.config.RabbitListenerConfigUtils;
-import org.springframework.amqp.rabbit.listener.RabbitListenerEndpointRegistry;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.EnvironmentAware;
@@ -37,7 +36,7 @@
  *
  * @see RabbitListenerAnnotationBeanPostProcessor
  * @see MultiRabbitListenerAnnotationBeanPostProcessor
- * @see RabbitListenerEndpointRegistry
+ * @see org.springframework.amqp.rabbit.listener.RabbitListenerEndpointRegistry
  * @see EnableRabbit
  */
 public class MultiRabbitBootstrapConfiguration implements ImportBeanDefinitionRegistrar, EnvironmentAware {
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/annotation/MultiRabbitListenerAnnotationBeanPostProcessor.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/annotation/MultiRabbitListenerAnnotationBeanPostProcessor.java
index 0d37bdea45..939bd6b583 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/annotation/MultiRabbitListenerAnnotationBeanPostProcessor.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/annotation/MultiRabbitListenerAnnotationBeanPostProcessor.java
@@ -83,7 +83,7 @@ protected String resolveMultiRabbitAdminName(RabbitListener rabbitListener) {
 	/**
 	 * An {@link InvocationHandler} to provide a replacing admin() parameter of the listener.
 	 */
-	private final class RabbitListenerAdminReplacementInvocationHandler implements InvocationHandler {
+	private static final class RabbitListenerAdminReplacementInvocationHandler implements InvocationHandler {
 
 		private final RabbitListener target;
 		private final String admin;