diff --git a/cmd/tink-worker/internal/worker.go b/cmd/tink-worker/internal/worker.go
index 4afaa7776..947540c74 100644
--- a/cmd/tink-worker/internal/worker.go
+++ b/cmd/tink-worker/internal/worker.go
@@ -149,8 +149,9 @@ func (w *Worker) execute(ctx context.Context, wfID string, action *pb.WorkflowAc
 			}
 			l.With("containerID", id, "status", status.String(), "command", action.GetOnTimeout()).Info("container created")
 			failedActionStatus := make(chan pb.State)
-			// TODD(jwb) Need to handle this capture logs as well
-			go w.captureLogs(ctx, id)
+			if captureLogs {
+				go w.captureLogs(ctx, id)
+			}
 			go waitFailedContainer(ctx, l, cli, id, failedActionStatus)
 			err = startContainer(ctx, l, cli, id)
 			if err != nil {
@@ -165,8 +166,9 @@ func (w *Worker) execute(ctx context.Context, wfID string, action *pb.WorkflowAc
 					l.Error(errors.Wrap(err, errFailedToRunCmd))
 				}
 				l.With("containerID", id, "actionStatus", status.String(), "command", action.GetOnFailure()).Info("container created")
-				// TODO(jwb) - Handle logging here too
-				go w.captureLogs(ctx, id)
+				if captureLogs {
+					go w.captureLogs(ctx, id)
+				}
 				go waitFailedContainer(ctx, l, cli, id, failedActionStatus)
 				err = startContainer(ctx, l, cli, id)
 				if err != nil {