diff --git a/packages/envd/internal/services/process/handler/handler.go b/packages/envd/internal/services/process/handler/handler.go
index e30320944d..5f440c85ac 100644
--- a/packages/envd/internal/services/process/handler/handler.go
+++ b/packages/envd/internal/services/process/handler/handler.go
@@ -450,7 +450,9 @@ func (p *Handler) Wait() {
 
 	err := p.cmd.Wait()
 
-	p.tty.Close()
+	if p.tty != nil {
+		p.tty.Close()
+	}
 
 	var errMsg *string
 
diff --git a/packages/envd/internal/services/process/service.go b/packages/envd/internal/services/process/service.go
index 01b839ba9c..54a47d1545 100644
--- a/packages/envd/internal/services/process/service.go
+++ b/packages/envd/internal/services/process/service.go
@@ -66,10 +66,10 @@ func (s *Service) getProcess(selector *rpc.ProcessSelector) (*handler.Handler, e
 			if *value.Tag == tag {
 				proc = value
 
-				return true
+				return false
 			}
 
-			return false
+			return true
 		})
 
 		if proc == nil {