diff --git a/src/main/java/io/cresco/agent/controller/communication/ActiveBroker.java b/src/main/java/io/cresco/agent/controller/communication/ActiveBroker.java
index 02f268f..6f97e46 100644
--- a/src/main/java/io/cresco/agent/controller/communication/ActiveBroker.java
+++ b/src/main/java/io/cresco/agent/controller/communication/ActiveBroker.java
@@ -87,6 +87,7 @@ public ActiveBroker(ControllerEngine controllerEngine, String brokerName) {
 				entry.setQueue(">");
 				//enable prioritization of messages in queues
 				entry.setPrioritizedMessages(true);
+				entry.setProducerFlowControl(true);
 
 				entry.setTopic(">");
 				//enable prioritization of messages in queues
@@ -102,6 +103,7 @@ public ActiveBroker(ControllerEngine controllerEngine, String brokerName) {
 				boolean allConsumersExclusive = plugin.getConfig().getBooleanParam("all_consumers_exclusive",true);
 				entry.setAllConsumersExclusiveByDefault(allConsumersExclusive);
 
+				entry.setProducerFlowControl(true);
 				//entry.setOptimizedDispatch(true);
 				//entry.setProducerFlowControl(true);
 				//entry.setAdvisoryWhenFull(true);
diff --git a/src/main/java/io/cresco/agent/controller/communication/MsgRouter.java b/src/main/java/io/cresco/agent/controller/communication/MsgRouter.java
index 58d1f35..129000a 100644
--- a/src/main/java/io/cresco/agent/controller/communication/MsgRouter.java
+++ b/src/main/java/io/cresco/agent/controller/communication/MsgRouter.java
@@ -317,7 +317,7 @@ public void route(MsgEvent rm) {
                         logger.trace(rm.getParams().toString());
                         forwardToLocalPlugin(rm);
                         break;
-                        
+
                     case 12671:
                         logger.debug("remote agent sending message to local agent");
                         logger.trace(rm.getParams().toString());