diff --git a/app/src/main/java/org/mozilla/fenix/browser/UriOpenedObserver.kt b/app/src/main/java/org/mozilla/fenix/browser/UriOpenedObserver.kt
index 853a58fbf..695e816c2 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/UriOpenedObserver.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/UriOpenedObserver.kt
@@ -29,10 +29,6 @@ class UriOpenedObserver(
         activity.metrics
     )
 
-    init {
-        sessionManager.register(this, owner)
-    }
-
     /**
      * Currently, [Session.Observer.onLoadingStateChanged] is called multiple times the first
      * time a new session loads a page. This is inflating our telemetry numbers, so we need to
@@ -65,6 +61,15 @@ class UriOpenedObserver(
         }
     }
 
+    init {
+        sessionManager.register(this, owner)
+        sessionManager.selectedSession?.register(singleSessionObserver, owner)
+    }
+
+    override fun onSessionSelected(session: Session) {
+        session.register(singleSessionObserver, owner)
+    }
+
     override fun onAllSessionsRemoved() {
         sessionManager.sessions.forEach {
             it.unregister(singleSessionObserver)
diff --git a/docs/metrics.md b/docs/metrics.md
index e95729c3a..baba0095e 100644
--- a/docs/metrics.md
+++ b/docs/metrics.md
@@ -249,6 +249,14 @@ This ping is intended to provide an understanding of startup performance.
 The ping is intended to be captured by performance testing automation to report results there, in addition to user telemetry. We place these metrics into their own ping in order to isolate them and make this process easier.
 
 
+**Data reviews for this ping:**
+
+- <https://github.com/mozilla-mobile/fenix/pull/9788#pullrequestreview-394228626>
+
+**Bugs related to this ping:**
+
+- <https://github.com/mozilla-mobile/fenix/issues/8803>
+
 The following metrics are added to the ping:
 
 | Name | Type | Description | Data reviews | Extras | Expiration |