diff --git a/gateway/listener.go b/gateway/listener.go
index 8b96b2e..c91bfac 100644
--- a/gateway/listener.go
+++ b/gateway/listener.go
@@ -348,11 +348,18 @@ func (l *Listener) udpReadFromClient(tunnelConn net.Conn, raddr *net.UDPAddr, co
 func (l *Listener) Close() {
 	l.closeOnce.Do(func() {
 		close(l.close)
+	})
+}
+
+func (l *Listener) listenForCloseSignal() {
+	select {
+	case <-l.close:
+		logs.Debug("Received close signal, shutting down...")
 		if l.tcpListener != nil {
 			l.tcpListener.Close()
 		}
 		if l.udpListener != nil {
 			l.udpListener.Close()
 		}
-	})
+	}
 }