diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java b/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java index d20c0b9408..d4efa94d3d 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java @@ -289,7 +289,7 @@ public class SchedulerBroker extends BrokerFilter implements JobListener { protected synchronized JobScheduler getInternalScheduler() throws Exception { if (this.started.get()) { - if (this.scheduler == null) { + if (this.scheduler == null && store != null) { this.scheduler = store.getJobScheduler("JMS"); this.scheduler.addListener(this); this.scheduler.startDispatching();