diff --git a/Appl/CEP/CS1/CS1_Storage/src/AH_Storage.cc b/Appl/CEP/CS1/CS1_Storage/src/AH_Storage.cc
index 1ad10fd520cd191a219ca382bd5c6458771cb188..b9ab968e515f9f8fd8ca8eae97ba530a8e8e771d 100644
--- a/Appl/CEP/CS1/CS1_Storage/src/AH_Storage.cc
+++ b/Appl/CEP/CS1/CS1_Storage/src/AH_Storage.cc
@@ -84,10 +84,16 @@ namespace LOFAR
         // Each writer will run on a separate node.
         step.runOnNode(nw);
 
+	vector<int> channels;
         // Connect to BG output
 	for (int core = 0; core < nNodesPerCell; core++) {
+	  step.getInDataManager(core).setInBuffer(core, false, 10);
 	  itsStub->connect(nw, core, step.getInDataManager(core), core);
+	  channels.push_back(core);
 	}	
+
+	// limit the number of concurrent incoming connections
+	step.getInDataManager(0).setInRoundRobinPolicy(channels, 1);
       }
 
 #ifdef HAVE_MPI