diff --git a/pkg/tunnel/services.go b/pkg/tunnel/services.go
index cb86ac54c..b85052a0b 100644
--- a/pkg/tunnel/services.go
+++ b/pkg/tunnel/services.go
@@ -209,8 +209,11 @@ func runServicesIteration(
 		errChan:      errChan,
 	})
 
-	writer := log.Writer(log.LevelDebug)
-	defer func() { _ = writer.Close() }()
+	writer, writerDone := log.PipeJSONStream()
+	defer func() {
+		_ = writer.Close()
+		<-writerDone
+	}()
 
 	command := buildCredentialsCommand(ctx, opts)