diff --git a/pkg/command/server.go b/pkg/command/server.go
index 50e30376a1..b1df23e6a5 100644
--- a/pkg/command/server.go
+++ b/pkg/command/server.go
@@ -171,10 +171,11 @@ func trap(logger log.Logger, runtime *gorun.Runtime) {
 
 	logger.Info().Msgf("Service runtime started")
 
-	select {
-	case <-shutdown:
+	// block until there is a value
+	for range shutdown {
 		logger.Info().Msg("shutdown signal received")
 		logger.Info().Msg("stopping service runtime")
+		close(shutdown)
 	}
 
 	if err := (*runtime).Stop(); err != nil {