diff --git a/spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBus.java b/spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBus.java
index db12e23be7..825ca847cd 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBus.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBus.java
@@ -314,7 +314,7 @@ public class MessageBus implements ChannelRegistry, ApplicationContextAware, Lif
 			handler = new PooledMessageHandler(handler, concurrencyPolicy.getCoreConcurrency(), concurrencyPolicy.getMaxConcurrency());
 		}
 		dispatcher.addHandler(handler, schedule);
-		if (this.isRunning()) {
+		if (this.isRunning() && !dispatcher.isRunning()) {
 			dispatcher.start();
 		}
 	}
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/bus/FixedRateConsumerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/bus/FixedRateConsumerTests.java
index b66f8cef84..4f5975d045 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/bus/FixedRateConsumerTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/bus/FixedRateConsumerTests.java
@@ -107,7 +107,6 @@ public class FixedRateConsumerTests {
 		latch.await(80, TimeUnit.MILLISECONDS);
 		int count = counter.get();
 		assertTrue("received " + count + ", but expected less than 20", count < 20);
-		assertTrue("received " + count + ", but expected more than 5", count > 5);
 	}
 
 }