diff --git a/internal/telemetry/metrics.go b/internal/telemetry/metrics.go
index 8c5e164..c75ebb9 100644
--- a/internal/telemetry/metrics.go
+++ b/internal/telemetry/metrics.go
@@ -210,7 +210,9 @@ func SetObservableCallback(cb func(context.Context, metric.Observer) error) {
 		reg, e := meter.RegisterCallback(cb, mSiteOnline, mSiteLastHeartbeat, mTunnelSessions)
 		if e != nil {
 			otel.Handle(e)
-			obsStopper = func() {}
+			obsStopper = func() {
+				// no-op: registration failed; keep stopper callable
+			}
 			return
 		}
 		// Provide a functional stopper mirroring proxy/build-info behavior
diff --git a/internal/telemetry/state_view.go b/internal/telemetry/state_view.go
index 275217c..1a51452 100644
--- a/internal/telemetry/state_view.go
+++ b/internal/telemetry/state_view.go
@@ -39,7 +39,7 @@ func RegisterStateView(v StateView) {
 					for _, siteID := range sv.ListSites() {
 						observeSiteOnlineFor(o, sv, siteID)
 						observeLastHeartbeatFor(o, sv, siteID)
-						observeSessionsFor(o, any)
+						observeSessionsFor(o, siteID, sv)
 					}
 				}
 			}
@@ -51,9 +51,11 @@ func RegisterStateView(v StateView) {
 func observeSiteOnlineFor(o metric.Observer, sv StateView, siteID string) {
 	if online, ok := sv.Online(siteID); ok {
 		val := int64(0)
-		if online { val = 1 }
+		if online {
+			val = 1
+		}
 		o.ObserveInt64(mSiteOnline, val, metric.WithAttributes(
-			attribute.String("site_id", getSiteID()),
+			attribute.String("site_id", siteID),
 		))
 	}
 }
@@ -62,16 +64,16 @@ func observeLastHeartbeatFor(o metric.Observer, sv StateView, siteID string) {
 	if t, ok := sv.LastHeartbeat(siteID); ok {
 		secs := time.Since(t).Seconds()
 		o.ObserveFloat64(mSiteLastHeartbeat, secs, metric.WithAttributes(
-			attribute.String("site_id", getSiteID()),
+			attribute.String("site_id", siteID),
 		))
 	}
 }
 
-func observeSessionsFor(o metric.Observer, any interface{}) {
+func observeSessionsFor(o metric.Observer, siteID string, any interface{}) {
 	if tm, ok := any.(interface{ SessionsByTunnel() map[string]int64 }); ok {
 		for tid, n := range tm.SessionsByTunnel() {
 			attrs := []attribute.KeyValue{
-				attribute.String("site_id", getSiteID()),
+				attribute.String("site_id", siteID),
 			}
 			if ShouldIncludeTunnelID() && tid != "" {
 				attrs = append(attrs, attribute.String("tunnel_id", tid))
diff --git a/internal/telemetry/telemetry.go b/internal/telemetry/telemetry.go
index baa8220..14100ec 100644
--- a/internal/telemetry/telemetry.go
+++ b/internal/telemetry/telemetry.go
@@ -171,7 +171,7 @@ func buildResource(ctx context.Context, cfg Config) *resource.Resource {
 	return res
 }
 
-func setupMetricExport(ctx context.Context, cfg Config, res *resource.Resource) ([]sdkmetric.Reader, http.Handler, []func(context.Context) error, error) {
+func setupMetricExport(ctx context.Context, cfg Config, _ *resource.Resource) ([]sdkmetric.Reader, http.Handler, []func(context.Context) error, error) {
 	var readers []sdkmetric.Reader
 	var shutdowns []func(context.Context) error
 	var promHandler http.Handler