diff --git a/pkg/router/handler.go b/pkg/router/handler.go
index 7f9363f..9e9ca87 100644
--- a/pkg/router/handler.go
+++ b/pkg/router/handler.go
@@ -75,7 +75,9 @@ func NewHandlerSet(name string, scheme *runtime.Scheme, backend backend.Backend)
 }
 
 func (m *HandlerSet) Start(ctx context.Context) error {
-	m.ctx = ctx
+	if m.ctx == nil {
+		m.ctx = ctx
+	}
 	if err := m.WatchGVK(m.handlers.GVKs()...); err != nil {
 		return err
 	}
@@ -83,6 +85,12 @@ func (m *HandlerSet) Start(ctx context.Context) error {
 }
 
 func (m *HandlerSet) Preload(ctx context.Context) error {
+	if m.ctx == nil {
+		m.ctx = ctx
+	}
+	if err := m.WatchGVK(m.handlers.GVKs()...); err != nil {
+		return err
+	}
 	return m.backend.Preload(ctx)
 }
 
@@ -253,7 +261,7 @@ func (m *HandlerSet) onChange(gvk schema.GroupVersionKind, key string, runtimeOb
 	}
 
 	if !fromReplay && !fromTrigger {
-		// Process delay have key has be reassigned from the TriggerPrefix
+		// Process delay have key has been reassigned from the TriggerPrefix
 		if !m.checkDelay(gvk, key) {
 			return runtimeObject, nil
 		}
diff --git a/pkg/router/healthz.go b/pkg/router/healthz.go
index 10bd213..fe3f479 100644
--- a/pkg/router/healthz.go
+++ b/pkg/router/healthz.go
@@ -39,7 +39,7 @@ func setHealthy(name string, healthy bool) {
 	healthz.healths[name] = healthy
 }
 
-func getHealthy() bool {
+func GetHealthy() bool {
 	healthz.lock.RLock()
 	defer healthz.lock.RUnlock()
 	for _, healthy := range healthz.healths {
@@ -47,7 +47,7 @@ func getHealthy() bool {
 			return false
 		}
 	}
-	return true
+	return len(healthz.healths) > 0
 }
 
 // startHealthz starts a healthz server on the healthzPort. If the server is already running, then this is a no-op.
@@ -65,7 +65,7 @@ func startHealthz(ctx context.Context) {
 
 	mux := http.NewServeMux()
 	mux.HandleFunc("/healthz", func(w http.ResponseWriter, req *http.Request) {
-		if getHealthy() {
+		if GetHealthy() {
 			w.WriteHeader(http.StatusOK)
 			return
 		}
diff --git a/pkg/router/router.go b/pkg/router/router.go
index 80be66a..16f2953 100644
--- a/pkg/router/router.go
+++ b/pkg/router/router.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
+	"sync"
 
 	"github.com/obot-platform/nah/pkg/backend"
 	"github.com/obot-platform/nah/pkg/leader"
@@ -21,10 +22,9 @@ type Router struct {
 	OnErrorHandler ErrorHandler
 	handlers       *HandlerSet
 	electionConfig *leader.ElectionConfig
-	hasHealthz     bool
+	startLock      sync.Mutex
 	postStarts     []func(context.Context, kclient.Client)
 	signalStopped  chan struct{}
-	cancel         func()
 }
 
 // New returns a new *Router with given HandlerSet and ElectionConfig. Passing a nil ElectionConfig is valid and results
@@ -41,7 +41,6 @@ func New(handlerSet *HandlerSet, electionConfig *leader.ElectionConfig, healthzP
 
 	if healthzPort > 0 {
 		setPort(healthzPort)
-		r.hasHealthz = true
 	}
 
 	r.RouteBuilder.router = r
@@ -187,44 +186,43 @@ func (r RouteBuilder) Handler(h Handler) {
 }
 
 func (r *Router) Start(ctx context.Context) error {
-	if r.cancel != nil {
-		return fmt.Errorf("router already started")
-	}
-
 	id, err := os.Hostname()
 	if err != nil {
 		return err
 	}
 
-	if r.hasHealthz {
-		startHealthz(ctx)
-	}
+	startHealthz(ctx)
 
 	r.handlers.onError = r.OnErrorHandler
 
-	ctx, r.cancel = context.WithCancel(ctx)
-
 	// It's OK to start the electionConfig even if it's nil.
 	return r.electionConfig.Run(ctx, id, r.startHandlers, func(leader string) {
+		if id == leader {
+			return
+		}
+
+		r.startLock.Lock()
+		defer r.startLock.Unlock()
+
+		setHealthy(r.name, false)
+		defer setHealthy(r.name, true)
 		// I am not the leader, so I am healthy when my cache is ready.
 		if err := r.handlers.Preload(ctx); err != nil {
 			// Failed to preload caches, panic
 			log.Fatalf("failed to preload caches: %v", err)
 		}
-		if r.hasHealthz {
-			setHealthy(r.name, id != leader)
-		}
 	}, r.signalStopped)
 }
 
 // startHandlers gets called when we become the leader or if there is no leader election.
 func (r *Router) startHandlers(ctx context.Context) error {
+	r.startLock.Lock()
+	defer r.startLock.Unlock()
+
 	var err error
 	// This is the leader now, so not ready until the controller is started and caches are ready.
-	if r.hasHealthz {
-		setHealthy(r.name, false)
-		defer setHealthy(r.name, err == nil)
-	}
+	setHealthy(r.name, false)
+	defer setHealthy(r.name, err == nil)
 
 	if err = r.handlers.Start(ctx); err != nil {
 		return err