diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/NBBaseComponent.java b/nb-api/src/main/java/io/nosqlbench/nb/api/components/NBBaseComponent.java
index 0fded6ab1..ea6d2739c 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/components/NBBaseComponent.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/components/NBBaseComponent.java
@@ -17,6 +17,7 @@
 package io.nosqlbench.nb.api.components;
 
 import io.nosqlbench.nb.api.components.decorators.NBTokenWords;
+import io.nosqlbench.nb.api.components.events.ComponentOutOfScope;
 import io.nosqlbench.nb.api.components.events.DownEvent;
 import io.nosqlbench.nb.api.components.events.NBEvent;
 import io.nosqlbench.nb.api.components.events.UpEvent;
@@ -171,6 +172,14 @@ public class NBBaseComponent extends NBBaseComponentMetrics implements NBCompone
                     child.onEvent(de);
                 }
             }
+            case ComponentOutOfScope coos -> {
+                for (NBMetric m : this.getComponentMetrics()) {
+                    reportExecutionMetric(m);
+                }
+                if (bufferOrphanedMetrics) {
+                    metricsBuffer.printMetricSummary(this);
+                }
+            }
             default -> logger.warn("dropping event " + event);
         }
     }