diff --git a/main.go b/main.go
index d3624c8..6c68431 100644
--- a/main.go
+++ b/main.go
@@ -469,6 +469,8 @@ func main() {
 	}
 	endpoint = client.GetConfig().Endpoint // Update endpoint from config
 	id = client.GetConfig().ID             // Update ID from config
+	// Update site labels for metrics with the resolved ID
+	telemetry.UpdateSiteInfo(id, region)
 
 	// output env var values if set
 	logger.Debug("Endpoint: %v", endpoint)
@@ -740,12 +742,6 @@ persistent_keepalive_interval=5`, fixKey(privateKey.String()), fixKey(wgData.Pub
 			state.Global().ClearTunnel(wgData.PublicKey)
 		}
 
-		// Clear metrics attrs and sessions for the tunnel
-		if pm != nil {
-			pm.ClearTunnelID()
-			state.Global().ClearTunnel(wgData.PublicKey)
-		}
-
 		// Mark as disconnected
 		connected = false