diff --git a/packages/core/src/dataspace.js b/packages/core/src/dataspace.js
index 5098bb5..e842d2e 100644
--- a/packages/core/src/dataspace.js
+++ b/packages/core/src/dataspace.js
@@ -730,7 +730,9 @@ Facet.prototype.addDataflow = function (subjectFun, priority) {
   return this.addEndpoint(() => {
     let subjectId = this.actor.dataspace.dataflow.currentSubjectId;
     this.actor.scheduleScript(() => {
-      this.actor.dataspace.dataflow.withSubject(subjectId, () => subjectFun.call(this.fields));
+      if (this.isLive) {
+        this.actor.dataspace.dataflow.withSubject(subjectId, () => subjectFun.call(this.fields));
+      }
     }, priority);
     return [void 0, null];
   });