diff --git a/packages/comms/src/ecl/queryGraph.ts b/packages/comms/src/ecl/queryGraph.ts
index 00c9a5ad05..93d9b8b3b7 100644
--- a/packages/comms/src/ecl/queryGraph.ts
+++ b/packages/comms/src/ecl/queryGraph.ts
@@ -753,9 +753,13 @@ export class QueryGraph {
                             } else if (edge._sourceActivity || edge._targetActivity) {
                                 edge._isSpill = true;
                                 const source = edge.getSource();
-                                source._isSpill = true;
+                                if (source) {
+                                    source._isSpill = true;
+                                }
                                 const target = edge.getTarget();
-                                target._isSpill = true;
+                                if (target) {
+                                    target._isSpill = true;
+                                }
                             }
                             retVal.addEdge(edge);
                             break;