diff --git a/src/server/main.go b/src/server/main.go
index 48b1b44..468b899 100644
--- a/src/server/main.go
+++ b/src/server/main.go
@@ -288,8 +288,6 @@ func main() {
 		}
 	}
 
-	select {
-	case <-interrupt:
-		log.Println("Interrupted")
-	}
+	<-interrupt
+	log.Println("Interrupted")
 }
diff --git a/src/signaling/natsclient_loopback.go b/src/signaling/natsclient_loopback.go
index 2c2f10f..42476e5 100644
--- a/src/signaling/natsclient_loopback.go
+++ b/src/signaling/natsclient_loopback.go
@@ -148,13 +148,11 @@ func (c *LoopbackNatsClient) Request(subject string, data []byte, timeout time.D
 		c.mu.Unlock()
 		ctx, cancel := context.WithTimeout(context.Background(), timeout)
 		defer cancel()
-		select {
-		case <-ctx.Done():
-			if ctx.Err() == context.DeadlineExceeded {
-				err = nats.ErrTimeout
-			} else {
-				err = ctx.Err()
-			}
+		<-ctx.Done()
+		if ctx.Err() == context.DeadlineExceeded {
+			err = nats.ErrTimeout
+		} else {
+			err = ctx.Err()
 		}
 		c.mu.Lock()
 		return nil, err