diff --git a/Framework/Core/src/ExternalFairMQDeviceProxy.cxx b/Framework/Core/src/ExternalFairMQDeviceProxy.cxx
index 239dd5f40e82f..5a88be2dde6e1 100644
--- a/Framework/Core/src/ExternalFairMQDeviceProxy.cxx
+++ b/Framework/Core/src/ExternalFairMQDeviceProxy.cxx
@@ -240,10 +240,13 @@ void injectMissingData(fair::mq::Device& device, fair::mq::Parts& parts, std::ve
 {
   // Check for missing data.
   static std::vector<bool> present;
+  static std::vector<bool> ignored;
   static std::vector<size_t> dataSizes;
   static std::vector<bool> showSize;
   present.clear();
   present.resize(routes.size(), false);
+  ignored.clear();
+  ignored.resize(routes.size(), false);
   dataSizes.clear();
   dataSizes.resize(routes.size(), 0);
   showSize.clear();
@@ -260,7 +263,7 @@ void injectMissingData(fair::mq::Device& device, fair::mq::Parts& parts, std::ve
   for (size_t pi = 0; pi < present.size(); ++pi) {
     auto& spec = routes[pi].matcher;
     if (DataSpecUtils::asConcreteDataTypeMatcher(spec).description == header::DataDescription("DISTSUBTIMEFRAME")) {
-      present[pi] = true;
+      ignored[pi] = true;
       continue;
     }
     if (routes[pi].timeslice == 0) {
@@ -269,6 +272,7 @@ void injectMissingData(fair::mq::Device& device, fair::mq::Parts& parts, std::ve
   }
 
   size_t foundDataSpecs = 0;
+  bool skipAsAllFound = false;
   for (int msgidx = 0; msgidx < parts.Size(); msgidx += 2) {
     bool allFound = true;
     int addToSize = -1;
@@ -300,24 +304,24 @@ void injectMissingData(fair::mq::Device& device, fair::mq::Parts& parts, std::ve
       dph = o2::header::get<DataProcessingHeader*>(parts.At(msgidx)->GetData());
       for (size_t pi = 0; pi < present.size(); ++pi) {
         if (routes[pi].timeslice != (dph->startTime % routes[pi].maxTimeslices)) {
-          present[pi] = true;
+          ignored[pi] = true;
         }
       }
     }
     for (size_t pi = 0; pi < present.size(); ++pi) {
-      if (present[pi] && !doPrintSizes) {
+      if ((present[pi] || ignored[pi]) && !doPrintSizes) {
         continue;
       }
       // Consider uninvolved pipelines as present.
       if (routes[pi].timeslice != (dph->startTime % routes[pi].maxTimeslices)) {
-        present[pi] = true;
+        ignored[pi] = true;
         continue;
       }
       allFound = false;
       auto& spec = routes[pi].matcher;
       OutputSpec query{dh->dataOrigin, dh->dataDescription, dh->subSpecification};
       if (DataSpecUtils::match(spec, query)) {
-        if (!present[pi]) {
+        if (!present[pi] && !ignored[pi]) {
           ++foundDataSpecs;
           present[pi] = true;
           showSize[pi] = true;
@@ -336,16 +340,27 @@ void injectMissingData(fair::mq::Device& device, fair::mq::Parts& parts, std::ve
     // Skip the rest of the block of messages. We subtract 2 because above we increment by 2.
     msgidx = msgidxLast - 2;
     if (allFound && !doPrintSizes) {
-      return;
+      skipAsAllFound = true;
+      break;
     }
   }
 
+  bool emptyTf = true;
   for (size_t pi = 0; pi < present.size(); ++pi) {
-    if (!present[pi]) {
+    if (present[pi] && !ignored[pi]) {
+      emptyTf = false;
+    }
+    if (!present[pi] && !ignored[pi]) {
       showSize[pi] = true;
       unmatchedDescriptions.push_back(pi);
     }
   }
+  int timeframeCompleteness = emptyTf ? 0 : (unmatchedDescriptions.size() ? -1 : 1);
+  (void)timeframeCompleteness; // To be sent as message
+
+  if (skipAsAllFound && !doPrintSizes) {
+    return;
+  }
 
   if (firstDH && doPrintSizes) {
     std::string sizes = "";