diff --git a/internal/cmd/server.go b/internal/cmd/server.go
index 9187da8..e23785b 100644
--- a/internal/cmd/server.go
+++ b/internal/cmd/server.go
@@ -98,7 +98,10 @@ func RunServer(ctx context.Context, stopSignal chan os.Signal) {
 			s.EnableHTTPS(certFile, keyFile)
 		}
 
-		s.Run()
+		go s.Run()
+		select {
+		case <-ctx.Done():
+		}
 		stopSignal <- syscall.SIGQUIT
 	}()
 	return