diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java
index 5d0b915710..d5df469ba5 100644
--- a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java
+++ b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java
@@ -285,6 +285,10 @@ public class IntegrationMBeanExporter extends MBeanExporter implements BeanPostP
 	}
 
 	protected void doStop() {
+		unregisterBeans();
+		channelsByName.clear();
+		handlersByName.clear();
+		sourcesByName.clear();
 	}
 
 	protected void doStart() {