diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go
index bbcdaa52bf3934d528a5311debc114b5f5bfe687..3afe5e766b7765fb78321e6d5e80dad1f65e65b4 100644
--- a/pkg/daemon/daemon.go
+++ b/pkg/daemon/daemon.go
@@ -55,6 +55,7 @@ type GitDaemon struct {
 	logger    *log.Logger
 	done      atomic.Bool // indicates if the server has been closed
 	listeners []net.Listener
+	liMu      sync.Mutex
 }
 
 // NewDaemon returns a new Git daemon.
@@ -93,7 +94,9 @@ func (d *GitDaemon) Serve(listener net.Listener) error {
 
 	d.wg.Add(1)
 	defer d.wg.Done()
+	d.liMu.Lock()
 	d.listeners = append(d.listeners, listener)
+	d.liMu.Unlock()
 
 	var tempDelay time.Duration
 	for {
@@ -324,12 +327,14 @@ func (d *GitDaemon) closeListener() error {
 		return ErrServerClosed
 	}
 	var err error
+	d.liMu.Lock()
 	for _, l := range d.listeners {
 		if err = l.Close(); err != nil {
 			err = errors.Join(err, fmt.Errorf("close listener %s: %w", l.Addr(), err))
 		}
 	}
 	d.listeners = d.listeners[:0]
+	d.liMu.Unlock()
 	d.once.Do(func() {
 		d.done.Store(true)
 		close(d.finished)