diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
index 6911cc48ba..38f39b4bea 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -1828,11 +1828,11 @@ public class BrokerService implements Service {
             }
             broker = sb;
         }
-        broker = new TransactionBroker(broker, getPersistenceAdapter().createTransactionStore());
         if (isAdvisorySupport()) {
             broker = new AdvisoryBroker(broker);
         }
         broker = new CompositeDestinationBroker(broker);
+        broker = new TransactionBroker(broker, getPersistenceAdapter().createTransactionStore());
         if (isPopulateJMSXUserID()) {
             broker = new UserIDBroker(broker);
         }
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementCompositeQueueTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementCompositeQueueTest.java
new file mode 100644
index 0000000000..3f7862e53f
--- /dev/null
+++ b/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementCompositeQueueTest.java
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.broker.ft;
+
+/**
+ * Let's test composite destinations
+ * 
+ */
+public class QueueMasterSlaveUsingMasterConnectorElementCompositeQueueTest extends QueueMasterSlaveUsingMasterConnectorElementTest {
+
+    /**
+     * Returns the consumer subject.
+     *
+     * @return String - consumer subject
+     * @see org.apache.activemq.test.TestSupport#getConsumerSubject()
+     */
+    protected String getConsumerSubject() {
+        return "FOO.BAR.HUMBUG2";
+    }
+
+    /**
+     * Returns the producer subject.
+     *
+     * @return String - producer subject
+     * @see org.apache.activemq.test.TestSupport#getProducerSubject()
+     */
+    protected String getProducerSubject() {
+        return "queue://FOO.BAR.HUMBUG,queue://FOO.BAR.HUMBUG2";
+    }
+
+}
\ No newline at end of file