diff --git a/fairmq/devices/FairMQMerger.cxx b/fairmq/devices/FairMQMerger.cxx
index 8755f23f..251d884f 100644
--- a/fairmq/devices/FairMQMerger.cxx
+++ b/fairmq/devices/FairMQMerger.cxx
@@ -54,7 +54,7 @@ void FairMQMerger::Run()
             if (poller->CheckInput(i))
             {
                 // Try receiving the data.
-                if (dataInChannels[i]->Receive(msg) > 0)
+                if (dataInChannels[i]->Receive(msg) >= 0)
                 {
                     // If data was received, send it to output.
                     if (dataOutChannel.Send(msg) < 0)
diff --git a/fairmq/devices/FairMQSplitter.cxx b/fairmq/devices/FairMQSplitter.cxx
index d21f66e2..fabd8405 100644
--- a/fairmq/devices/FairMQSplitter.cxx
+++ b/fairmq/devices/FairMQSplitter.cxx
@@ -44,7 +44,7 @@ void FairMQSplitter::Run()
     {
         std::unique_ptr<FairMQMessage> msg(fTransportFactory->CreateMessage());
 
-        if (dataInChannel.Receive(msg) > 0)
+        if (dataInChannel.Receive(msg) >= 0)
         {
             dataOutChannels[direction]->Send(msg);
             ++direction;