diff --git a/core/capabilities/compute/compute.go b/core/capabilities/compute/compute.go
index 78a4cc1e033..cdb8ee19a6a 100644
--- a/core/capabilities/compute/compute.go
+++ b/core/capabilities/compute/compute.go
@@ -294,7 +294,6 @@ func (c *Compute) createFetcher() func(ctx context.Context, req *wasmpb.FetchReq
 		)
 
 		messageID := strings.Join([]string{
-			req.Metadata.WorkflowId,
 			req.Metadata.WorkflowExecutionId,
 			ghcapabilities.MethodComputeAction,
 			c.idGenerator(),
diff --git a/core/capabilities/compute/compute_test.go b/core/capabilities/compute/compute_test.go
index 719bff82edf..e0f5a2f9750 100644
--- a/core/capabilities/compute/compute_test.go
+++ b/core/capabilities/compute/compute_test.go
@@ -189,7 +189,6 @@ func TestComputeFetch(t *testing.T) {
 	th.connector.EXPECT().GatewayIDs().Return([]string{"gateway1", "gateway2"})
 
 	msgID := strings.Join([]string{
-		workflowID,
 		workflowExecutionID,
 		ghcapabilities.MethodComputeAction,
 		validRequestUUID,
diff --git a/core/services/standardcapabilities/delegate.go b/core/services/standardcapabilities/delegate.go
index a92e082dead..ceb69883e90 100644
--- a/core/services/standardcapabilities/delegate.go
+++ b/core/services/standardcapabilities/delegate.go
@@ -254,7 +254,7 @@ func (d *Delegate) ServicesForSpec(ctx context.Context, spec job.Job) ([]job.Ser
 		}
 
 		computeSrvc := compute.NewAction(cfg, log, d.registry, handler, idGeneratorFn)
-		return []job.ServiceCtx{computeSrvc}, nil
+		return []job.ServiceCtx{handler, computeSrvc}, nil
 	}
 
 	standardCapability := newStandardCapabilities(log, spec.StandardCapabilitiesSpec, d.cfg, telemetryService, kvStore, d.registry, errorLog,