diff --git a/node/node.go b/node/node.go
index a0071a9b6c7265a32b94894bcdf96c812aaa4c89..b73767f389159805d28581dd25ccbf83c40ead20 100644
--- a/node/node.go
+++ b/node/node.go
@@ -96,7 +96,11 @@ func New(parentCtx context.Context, session *concurrency.Session, ice Icecast, n
 			n.updateIcecast()
 		}
 	}()
-	<-configReady
+	select {
+	case <-ctx.Done():
+		return nil, ctx.Err()
+	case <-configReady:
+	}
 
 	// Register the Icecast endpoints. First the gossip service, below
 	// StatusEndpointPrefix with gossipPort, then the public Icecast