diff --git a/components/local-app/pkg/bastion/bastion.go b/components/local-app/pkg/bastion/bastion.go
index df5124fa46d5b3..c22ba18e334699 100644
--- a/components/local-app/pkg/bastion/bastion.go
+++ b/components/local-app/pkg/bastion/bastion.go
@@ -760,6 +760,9 @@ func (b *Bastion) tunnelPorts(ws *Workspace) {
 }
 
 func (b *Bastion) doTunnelPorts(ctx context.Context, ws *Workspace) error {
+	ctx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
 	statusService := supervisor.NewStatusServiceClient(ws.supervisorClient)
 	status, err := statusService.PortsStatus(ctx, &supervisor.PortsStatusRequest{
 		Observe: true,
diff --git a/components/supervisor/pkg/ports/served-ports.go b/components/supervisor/pkg/ports/served-ports.go
index 4ab4356ae4b0cf..a26457abcd7f90 100644
--- a/components/supervisor/pkg/ports/served-ports.go
+++ b/components/supervisor/pkg/ports/served-ports.go
@@ -40,7 +40,7 @@ type ServedPortsObserver interface {
 }
 
 const (
-	maxSubscriptions = 10
+	maxSubscriptions = 100
 
 	fnNetTCP  = "/proc/net/tcp"
 	fnNetTCP6 = "/proc/net/tcp6"