diff --git a/cameleer-server-core/src/main/java/com/cameleer/server/core/ingestion/ChunkAccumulator.java b/cameleer-server-core/src/main/java/com/cameleer/server/core/ingestion/ChunkAccumulator.java
index 9a8f1c0b..d8affa45 100644
--- a/cameleer-server-core/src/main/java/com/cameleer/server/core/ingestion/ChunkAccumulator.java
+++ b/cameleer-server-core/src/main/java/com/cameleer/server/core/ingestion/ChunkAccumulator.java
@@ -70,7 +70,11 @@ public class ChunkAccumulator {
                     chunk.getStartTime(),
                     chunk.getProcessors()));
             chunkHasTrace = chunk.getProcessors().stream()
-                    .anyMatch(p -> isNonEmpty(p.getInputBody()) || isNonEmpty(p.getOutputBody()));
+                    .anyMatch(p -> isNonEmpty(p.getInputBody()) || isNonEmpty(p.getOutputBody())
+                            || (p.getInputHeaders() != null && !p.getInputHeaders().isEmpty())
+                            || (p.getOutputHeaders() != null && !p.getOutputHeaders().isEmpty())
+                            || (p.getInputProperties() != null && !p.getInputProperties().isEmpty())
+                            || (p.getOutputProperties() != null && !p.getOutputProperties().isEmpty()));
         }
 
         // 2. Buffer/merge the exchange envelope
diff --git a/cameleer-server-core/src/main/java/com/cameleer/server/core/ingestion/IngestionService.java b/cameleer-server-core/src/main/java/com/cameleer/server/core/ingestion/IngestionService.java
index 01649c45..e586f92b 100644
--- a/cameleer-server-core/src/main/java/com/cameleer/server/core/ingestion/IngestionService.java
+++ b/cameleer-server-core/src/main/java/com/cameleer/server/core/ingestion/IngestionService.java
@@ -136,7 +136,9 @@ public class IngestionService {
     private static boolean hasAnyTraceData(List<ProcessorExecution> processors) {
         if (processors == null) return false;
         for (ProcessorExecution p : processors) {
-            if (p.getInputBody() != null || p.getOutputBody() != null) return true;
+            if (p.getInputBody() != null || p.getOutputBody() != null
+                    || p.getInputHeaders() != null || p.getOutputHeaders() != null
+                    || p.getInputProperties() != null || p.getOutputProperties() != null) return true;
         }
         return false;
     }