diff --git a/packages/envd/internal/port/scan.go b/packages/envd/internal/port/scan.go
index 2bc5560879..fdde0d6174 100644
--- a/packages/envd/internal/port/scan.go
+++ b/packages/envd/internal/port/scan.go
@@ -43,6 +43,9 @@ func (s *Scanner) Unsubscribe(sub *ScannerSubscriber) {
 
 // ScanAndBroadcast starts scanning open TCP ports and broadcasts every open port to all subscribers.
 func (s *Scanner) ScanAndBroadcast() {
+	ticker := time.NewTicker(s.period)
+	defer ticker.Stop()
+
 	for {
 		// tcp monitors both ipv4 and ipv6 connections.
 		processes, _ := net.Connections("tcp")
@@ -52,8 +55,7 @@ func (s *Scanner) ScanAndBroadcast() {
 		select {
 		case <-s.scanExit:
 			return
-		default:
-			time.Sleep(s.period)
+		case <-ticker.C:
 		}
 	}
 }
diff --git a/packages/envd/pkg/version.go b/packages/envd/pkg/version.go
index b9ec1976fe..abbbb74c05 100644
--- a/packages/envd/pkg/version.go
+++ b/packages/envd/pkg/version.go
@@ -1,3 +1,3 @@
 package pkg
 
-const Version = "0.6.10"
+const Version = "0.6.11"