diff --git a/Framework/Core/src/ExternalFairMQDeviceProxy.cxx b/Framework/Core/src/ExternalFairMQDeviceProxy.cxx
index 6db25dd46f3c4..50ed80d7bcd42 100644
--- a/Framework/Core/src/ExternalFairMQDeviceProxy.cxx
+++ b/Framework/Core/src/ExternalFairMQDeviceProxy.cxx
@@ -69,7 +69,7 @@ void sendOnChannel(FairMQDevice& device, FairMQParts& messages, std::string cons
   // TODO: we might want to treat this error condition some levels higher up, but for
   // the moment its an appropriate solution. The important thing is not to drop
   // messages and to be informed about the congestion.
-  while (device.NewStatePending() == false && device.Send(messages, channel, index, timeout) < 0) {
+  while (device.Send(messages, channel, index, timeout) < 0) {
     if (timeout == 0) {
       timeout = 1;
     } else if (timeout < maxTimeout) {
@@ -83,6 +83,15 @@ void sendOnChannel(FairMQDevice& device, FairMQParts& messages, std::string cons
         timeout += 1;
       }
     }
+    if (device.NewStatePending()) {
+      LOG(ERROR) << "device state change is requested, dropping " << messages.Size() << " pending message(s)\n"
+                 << "on channel " << channel << "\n"
+                 << "ATTENTION: DATA IS LOST! Could not dispatch data to downstream consumer(s), check if\n"
+                 << "consumers have been terminated too early";
+      // make sure we disable the warning below
+      timeout = maxTimeout + 1;
+      break;
+    }
   }
   if (timeout > 0 && timeout <= maxTimeout) {
     LOG(WARNING) << "dispatching on channel " << channel << " was delayed by " << timeout << " ms";