diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractStandardMessageHandlerFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractStandardMessageHandlerFactoryBean.java
index 084a3d0572..ceac102ab8 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractStandardMessageHandlerFactoryBean.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractStandardMessageHandlerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import java.util.Set;
 
 import org.springframework.aop.TargetSource;
 import org.springframework.aop.framework.Advised;
+import org.springframework.beans.factory.DisposableBean;
 import org.springframework.expression.Expression;
 import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
@@ -41,21 +42,23 @@ import org.springframework.util.StringUtils;
  * @author David Liu
  */
 public abstract class AbstractStandardMessageHandlerFactoryBean
-		extends AbstractSimpleMessageHandlerFactoryBean<MessageHandler> {
+		extends AbstractSimpleMessageHandlerFactoryBean<MessageHandler> implements DisposableBean {
 
 	private static final ExpressionParser expressionParser = new SpelExpressionParser();
 
 	private static final Set<MessageHandler> referencedReplyProducers = new HashSet<>();
 
-	private volatile Boolean requiresReply;
+	private Boolean requiresReply;
 
-	private volatile Object targetObject;
+	private Object targetObject;
 
-	private volatile String targetMethodName;
+	private String targetMethodName;
 
-	private volatile Expression expression;
+	private Expression expression;
 
-	private volatile Long sendTimeout;
+	private Long sendTimeout;
+
+	private MessageHandler replyHandler;
 
 	/**
 	 * Set the target POJO for the message handler.
@@ -101,6 +104,13 @@ public abstract class AbstractStandardMessageHandlerFactoryBean
 		return this.sendTimeout;
 	}
 
+	@Override
+	public void destroy() {
+		if (this.replyHandler != null) {
+			referencedReplyProducers.remove(this.replyHandler);
+		}
+	}
+
 	@Override
 	protected MessageHandler createHandler() {
 		MessageHandler handler;
@@ -158,6 +168,7 @@ public abstract class AbstractStandardMessageHandlerFactoryBean
 				"An AbstractMessageProducingMessageHandler may only be referenced once (" +
 						replyHandler.getComponentName() + ") - use scope=\"prototype\"");
 		referencedReplyProducers.add(replyHandler);
+		this.replyHandler = replyHandler;
 	}
 
 	/**
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/dsl/DslIntegrationConfigurationInitializer.java b/spring-integration-core/src/main/java/org/springframework/integration/config/dsl/DslIntegrationConfigurationInitializer.java
index 2f572a2c6d..ec4ef87088 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/dsl/DslIntegrationConfigurationInitializer.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/dsl/DslIntegrationConfigurationInitializer.java
@@ -24,6 +24,7 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.integration.config.IntegrationConfigurationInitializer;
 import org.springframework.integration.dsl.IntegrationComponentSpec;
+import org.springframework.integration.dsl.IntegrationFlowDefinition;
 import org.springframework.integration.dsl.context.IntegrationFlowContext;
 import org.springframework.util.Assert;
 
@@ -46,6 +47,9 @@ public class DslIntegrationConfigurationInitializer implements IntegrationConfig
 	private static final String INTEGRATION_FLOW_CONTEXT_BEAN_NAME =
 			Introspector.decapitalize(IntegrationFlowContext.class.getName());
 
+	private static final String INTEGRATION_FLOW_REPLY_PRODUCER_CLEANER_BEAN_NAME =
+			Introspector.decapitalize(IntegrationFlowDefinition.ReplyProducerCleaner.class.getName());
+
 	@Override
 	public void initialize(ConfigurableListableBeanFactory configurableListableBeanFactory) throws BeansException {
 		Assert.isInstanceOf(BeanDefinitionRegistry.class, configurableListableBeanFactory,
@@ -59,6 +63,8 @@ public class DslIntegrationConfigurationInitializer implements IntegrationConfig
 					new RootBeanDefinition(IntegrationFlowBeanPostProcessor.class));
 			registry.registerBeanDefinition(INTEGRATION_FLOW_CONTEXT_BEAN_NAME,
 					new RootBeanDefinition(IntegrationFlowContext.class));
+			registry.registerBeanDefinition(INTEGRATION_FLOW_REPLY_PRODUCER_CLEANER_BEAN_NAME,
+					new RootBeanDefinition(IntegrationFlowDefinition.ReplyProducerCleaner.class));
 		}
 	}
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java
index 746a1151ae..f29c81bb35 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java
@@ -29,7 +29,9 @@ import org.reactivestreams.Publisher;
 
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
+import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor;
 import org.springframework.expression.Expression;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.integration.aggregator.AggregatingMessageHandler;
@@ -122,9 +124,9 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 
 	protected final Map<Object, String> integrationComponents = new LinkedHashMap<>();
 
-	protected MessageChannel currentMessageChannel;
+	private MessageChannel currentMessageChannel;
 
-	protected Object currentComponent;
+	private Object currentComponent;
 
 	private StandardIntegrationFlow integrationFlow;
 
@@ -481,7 +483,9 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	 * @return the current {@link IntegrationFlowDefinition}.
 	 * @see ExpressionEvaluatingTransformer
 	 */
-	public B transform(String expression, Consumer<GenericEndpointSpec<MessageTransformingHandler>> endpointConfigurer) {
+	public B transform(String expression,
+			Consumer<GenericEndpointSpec<MessageTransformingHandler>> endpointConfigurer) {
+
 		Assert.hasText(expression, "'expression' must not be empty");
 		return transform(new ExpressionEvaluatingTransformer(PARSER.parseExpression(expression)),
 				endpointConfigurer);
@@ -2773,4 +2777,21 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 		REFERENCED_REPLY_PRODUCERS.add(replyHandler);
 	}
 
+	public static final class ReplyProducerCleaner implements DestructionAwareBeanPostProcessor {
+
+		private ReplyProducerCleaner() {
+		}
+
+		@Override
+		public boolean requiresDestruction(Object bean) {
+			return IntegrationFlowDefinition.REFERENCED_REPLY_PRODUCERS.contains(bean);
+		}
+
+		@Override
+		public void postProcessBeforeDestruction(Object bean, String beanName) throws BeansException {
+			IntegrationFlowDefinition.REFERENCED_REPLY_PRODUCERS.remove(bean);
+		}
+
+	}
+
 }
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelegatingConsumerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelegatingConsumerParserTests.java
index 2a8545e829..066ff0f98d 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelegatingConsumerParserTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelegatingConsumerParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package org.springframework.integration.config.xml;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -25,6 +26,7 @@ import static org.mockito.Mockito.mock;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Set;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -52,6 +54,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Gary Russell
+ * @author Artem Bilan
+ *
  * @since 3.0
  *
  */
@@ -59,61 +63,80 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @RunWith(SpringJUnit4ClassRunner.class)
 public class DelegatingConsumerParserTests {
 
-	@Autowired @Qualifier("directFilter.handler")
+	@Autowired
+	@Qualifier("directFilter.handler")
 	private MessageHandler directFilter;
 
-	@Autowired @Qualifier("refFilter.handler")
+	@Autowired
+	@Qualifier("refFilter.handler")
 	private MessageHandler refFilter;
 
-	@Autowired @Qualifier("filterWithMessageSelectorThatsAlsoAnARPMH.handler")
+	@Autowired
+	@Qualifier("filterWithMessageSelectorThatsAlsoAnARPMH.handler")
 	private MessageHandler filterWithMessageSelectorThatsAlsoAnARPMH;
 
-	@Autowired @Qualifier("directRouter.handler")
+	@Autowired
+	@Qualifier("directRouter.handler")
 	private MessageHandler directRouter;
 
-	@Autowired @Qualifier("refRouter.handler")
+	@Autowired
+	@Qualifier("refRouter.handler")
 	private MessageHandler refRouter;
 
-	@Autowired @Qualifier("directRouterMH.handler")
+	@Autowired
+	@Qualifier("directRouterMH.handler")
 	private MessageHandler directRouterMH;
 
-	@Autowired @Qualifier("refRouterMH.handler")
+	@Autowired
+	@Qualifier("refRouterMH.handler")
 	private MessageHandler refRouterMH;
 
-	@Autowired @Qualifier("directRouterARPMH.handler")
+	@Autowired
+	@Qualifier("directRouterARPMH.handler")
 	private MessageHandler directRouterARPMH;
 
-	@Autowired @Qualifier("refRouterARPMH.handler")
+	@Autowired
+	@Qualifier("refRouterARPMH.handler")
 	private MessageHandler refRouterARPMH;
 
-	@Autowired @Qualifier("directServiceARPMH.handler")
+	@Autowired
+	@Qualifier("directServiceARPMH.handler")
 	private MessageHandler directServiceARPMH;
 
-	@Autowired @Qualifier("refServiceARPMH.handler")
+	@Autowired
+	@Qualifier("refServiceARPMH.handler")
 	private MessageHandler refServiceARPMH;
 
-	@Autowired @Qualifier("directSplitter.handler")
+	@Autowired
+	@Qualifier("directSplitter.handler")
 	private MessageHandler directSplitter;
 
-	@Autowired @Qualifier("refSplitter.handler")
+	@Autowired
+	@Qualifier("refSplitter.handler")
 	private MessageHandler refSplitter;
 
-	@Autowired @Qualifier("splitterWithARPMH.handler")
+	@Autowired
+	@Qualifier("splitterWithARPMH.handler")
 	private MessageHandler splitterWithARPMH;
 
-	@Autowired @Qualifier("splitterWithARPMHWithAtts.handler")
+	@Autowired
+	@Qualifier("splitterWithARPMHWithAtts.handler")
 	private MessageHandler splitterWithARPMHWithAtts;
 
-	@Autowired @Qualifier("directTransformer.handler")
+	@Autowired
+	@Qualifier("directTransformer.handler")
 	private MessageHandler directTransformer;
 
-	@Autowired @Qualifier("refTransformer.handler")
+	@Autowired
+	@Qualifier("refTransformer.handler")
 	private MessageHandler refTransformer;
 
-	@Autowired @Qualifier("directTransformerARPMH.handler")
+	@Autowired
+	@Qualifier("directTransformerARPMH.handler")
 	private MessageHandler directTransformerARPMH;
 
-	@Autowired @Qualifier("refTransformerARPMH.handler")
+	@Autowired
+	@Qualifier("refTransformerARPMH.handler")
 	private MessageHandler refTransformerARPMH;
 
 	private static QueueChannel replyChannel = new QueueChannel();
@@ -153,7 +176,8 @@ public class DelegatingConsumerParserTests {
 		assertTrue(splitterWithARPMH instanceof MySplitterThatsAnARPMH);
 		testHandler(splitterWithARPMH);
 		assertTrue(splitterWithARPMHWithAtts instanceof MySplitterThatsAnARPMH);
-		assertEquals(Long.valueOf(123), TestUtils.getPropertyValue(splitterWithARPMHWithAtts, "messagingTemplate.sendTimeout", Long.class));
+		assertEquals(Long.valueOf(123),
+				TestUtils.getPropertyValue(splitterWithARPMHWithAtts, "messagingTemplate.sendTimeout", Long.class));
 		testHandler(splitterWithARPMHWithAtts);
 
 		assertTrue(directTransformer instanceof MessageTransformingHandler);
@@ -170,6 +194,7 @@ public class DelegatingConsumerParserTests {
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	public void testOneRefOnly() throws Exception {
 		ServiceActivatorFactoryBean fb = new ServiceActivatorFactoryBean();
 		fb.setBeanFactory(mock(BeanFactory.class));
@@ -177,17 +202,24 @@ public class DelegatingConsumerParserTests {
 		service.setBeanName("foo");
 		fb.setTargetObject(service);
 		fb.getObject();
-		fb = new ServiceActivatorFactoryBean();
-		fb.setBeanFactory(mock(BeanFactory.class));
-		fb.setTargetObject(service);
+
+		assertTrue(TestUtils.getPropertyValue(fb, "referencedReplyProducers", Set.class).contains(service));
+
+		ServiceActivatorFactoryBean fb2 = new ServiceActivatorFactoryBean();
+		fb2.setBeanFactory(mock(BeanFactory.class));
+		fb2.setTargetObject(service);
 		try {
-			fb.getObject();
+			fb2.getObject();
 			fail("expected exception");
 		}
 		catch (Exception e) {
 			assertEquals("An AbstractMessageProducingMessageHandler may only be referenced once (foo) - "
 					+ "use scope=\"prototype\"", e.getMessage());
 		}
+
+		fb.destroy();
+
+		assertFalse(TestUtils.getPropertyValue(fb, "referencedReplyProducers", Set.class).contains(service));
 	}
 
 	private void testHandler(MessageHandler handler) {
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/manualflow/ManualFlowTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/manualflow/ManualFlowTests.java
index e2f8de939b..345108e6c2 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/manualflow/ManualFlowTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/manualflow/ManualFlowTests.java
@@ -32,6 +32,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -63,6 +64,7 @@ import org.springframework.integration.core.MessageProducer;
 import org.springframework.integration.core.MessagingTemplate;
 import org.springframework.integration.dsl.IntegrationFlow;
 import org.springframework.integration.dsl.IntegrationFlowAdapter;
+import org.springframework.integration.dsl.IntegrationFlowBuilder;
 import org.springframework.integration.dsl.IntegrationFlowDefinition;
 import org.springframework.integration.dsl.IntegrationFlows;
 import org.springframework.integration.dsl.MessageProducerSpec;
@@ -72,8 +74,10 @@ import org.springframework.integration.dsl.context.IntegrationFlowContext;
 import org.springframework.integration.dsl.context.IntegrationFlowRegistration;
 import org.springframework.integration.endpoint.MessageProducerSupport;
 import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
+import org.springframework.integration.handler.BridgeHandler;
 import org.springframework.integration.history.MessageHistory;
 import org.springframework.integration.support.SmartLifecycleRoleController;
+import org.springframework.integration.test.util.TestUtils;
 import org.springframework.integration.transformer.MessageTransformingHandler;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
@@ -110,6 +114,7 @@ public class ManualFlowTests {
 	private SmartLifecycleRoleController roleController;
 
 	@Test
+	@SuppressWarnings("unchecked")
 	public void testWithAnonymousMessageProducerStart() {
 		final AtomicBoolean started = new AtomicBoolean();
 		MessageProducerSupport producer = new MessageProducerSupport() {
@@ -122,13 +127,26 @@ public class ManualFlowTests {
 
 		};
 		QueueChannel channel = new QueueChannel();
-		IntegrationFlow flow = IntegrationFlows.from(producer)
-				.channel(channel)
-				.get();
+		IntegrationFlowBuilder flowBuilder = IntegrationFlows.from(producer);
+
+		BridgeHandler bridgeHandler = new BridgeHandler();
+
+		IntegrationFlow flow =
+				flowBuilder.handle(bridgeHandler)
+						.channel(channel)
+						.get();
 		IntegrationFlowRegistration flowRegistration = this.integrationFlowContext.registration(flow).register();
 		assertTrue(started.get());
 
+
+		Set<MessageProducer> replyProducers =
+				TestUtils.getPropertyValue(flowBuilder, "REFERENCED_REPLY_PRODUCERS", Set.class);
+
+		assertTrue(replyProducers.contains(bridgeHandler));
+
 		flowRegistration.destroy();
+
+		assertFalse(replyProducers.contains(bridgeHandler));
 	}
 
 	@Test
@@ -183,12 +201,13 @@ public class ManualFlowTests {
 						.addBean(additionalBean)
 						.register();
 
+		String flowRegistrationId = flowRegistration.getId();
 		BeanFactoryHandler bean =
-				this.beanFactory.getBean(flowRegistration.getId() + BeanFactoryHandler.class.getName() + "#0",
+				this.beanFactory.getBean(flowRegistrationId + BeanFactoryHandler.class.getName() + "#0",
 						BeanFactoryHandler.class);
 		assertSame(additionalBean, bean);
 		assertSame(this.beanFactory, bean.beanFactory);
-		bean = this.beanFactory.getBean(flowRegistration.getId() + "." + "anId.handler", BeanFactoryHandler.class);
+		bean = this.beanFactory.getBean(flowRegistrationId + "." + "anId.handler", BeanFactoryHandler.class);
 
 		MessagingTemplate messagingTemplate = flowRegistration.getMessagingTemplate();
 		messagingTemplate.setReceiveTimeout(10000);
@@ -210,9 +229,9 @@ public class ManualFlowTests {
 
 		flowRegistration.destroy();
 
-		assertFalse(this.beanFactory.containsBean(flowRegistration.getId()));
-		assertFalse(this.beanFactory.containsBean(flowRegistration.getId() + ".input"));
-		assertFalse(this.beanFactory.containsBean(flowRegistration.getId() + BeanFactoryHandler.class.getName() + "#0"));
+		assertFalse(this.beanFactory.containsBean(flowRegistrationId));
+		assertFalse(this.beanFactory.containsBean(flowRegistrationId + ".input"));
+		assertFalse(this.beanFactory.containsBean(flowRegistrationId + BeanFactoryHandler.class.getName() + "#0"));
 
 		ThreadPoolTaskScheduler taskScheduler = this.beanFactory.getBean(ThreadPoolTaskScheduler.class);
 		Thread.sleep(100);