diff --git a/.chloggen/goleak_opampsupervisor.yaml b/.chloggen/goleak_opampsupervisor.yaml
new file mode 100755
index 000000000000..2fb0033e4e8e
--- /dev/null
+++ b/.chloggen/goleak_opampsupervisor.yaml
@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: cmd/opampsupervisor
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Fix memory leak on shutdown
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [30438]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: []
diff --git a/cmd/opampsupervisor/package_test.go b/cmd/opampsupervisor/package_test.go
new file mode 100644
index 000000000000..5cd502ca564b
--- /dev/null
+++ b/cmd/opampsupervisor/package_test.go
@@ -0,0 +1,14 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+package main
+
+import (
+	"testing"
+
+	"go.uber.org/goleak"
+)
+
+func TestMain(m *testing.M) {
+	goleak.VerifyTestMain(m)
+}
diff --git a/cmd/opampsupervisor/supervisor/supervisor.go b/cmd/opampsupervisor/supervisor/supervisor.go
index 5f42c4b4f691..302440a33bc7 100644
--- a/cmd/opampsupervisor/supervisor/supervisor.go
+++ b/cmd/opampsupervisor/supervisor/supervisor.go
@@ -14,6 +14,7 @@ import (
 	"net/http"
 	"os"
 	"sort"
+	"sync"
 	"sync/atomic"
 	"text/template"
 	"time"
@@ -100,6 +101,7 @@ type Supervisor struct {
 	opampClient client.OpAMPClient
 
 	shuttingDown bool
+	supervisorWG sync.WaitGroup
 
 	agentHasStarted               bool
 	agentStartHealthCheckAttempts int
@@ -160,7 +162,12 @@ func NewSupervisor(logger *zap.Logger, configFile string) (*Supervisor, error) {
 	}
 
 	s.startHealthCheckTicker()
-	go s.runAgentProcess()
+
+	s.supervisorWG.Add(1)
+	go func() {
+		defer s.supervisorWG.Done()
+		s.runAgentProcess()
+	}()
 
 	return s, nil
 }
@@ -698,7 +705,7 @@ func (s *Supervisor) runAgentProcess() {
 
 		case <-s.commander.Done():
 			if s.shuttingDown {
-				break
+				return
 			}
 
 			s.logger.Debug("Agent process exited unexpectedly. Will restart in a bit...", zap.Int("pid", s.commander.Pid()), zap.Int("exit_code", s.commander.ExitCode()))
@@ -782,6 +789,12 @@ func (s *Supervisor) Shutdown() {
 			s.logger.Error("Could not stop the OpAMP client", zap.Error(err))
 		}
 	}
+
+	if s.healthCheckTicker != nil {
+		s.healthCheckTicker.Stop()
+	}
+
+	s.supervisorWG.Wait()
 }
 
 func (s *Supervisor) onMessage(ctx context.Context, msg *types.MessageData) {