2 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp
index 83ebbcc2e6..258460fe8f 100644
--- a/cpp/src/qpid/cluster/Cluster.cpp
+++ b/cpp/src/qpid/cluster/Cluster.cpp
@@ -319,7 +319,9 @@ void Cluster::initialize() {
     broker.getKnownBrokers = boost::bind(&Cluster::getUrls, this);
     broker.setExpiryPolicy(expiryPolicy);
     dispatcher.start();
+    deliverEventQueue.bypassOff();
     deliverEventQueue.start();
+    deliverFrameQueue.bypassOff();
     deliverFrameQueue.start();
     mcast.start();
 
diff --git a/cpp/src/qpid/cluster/PollableQueue.h b/cpp/src/qpid/cluster/PollableQueue.h
index 59d0bcd36a..10e2ed6ac3 100644
--- a/cpp/src/qpid/cluster/PollableQueue.h
+++ b/cpp/src/qpid/cluster/PollableQueue.h
@@ -74,10 +74,7 @@ template <class T> class PollableQueue : public sys::PollableQueue<T> {
         else sys::PollableQueue<T>::push(t);
     }
 
-    void start() {
-        bypass = false;
-        sys::PollableQueue<T>::start();
-    }
+    void bypassOff() { bypass = false; }
 
   private:
     Callback callback;