diff --git a/devtools/client/netmonitor/src/connector/firefox-connector.js b/devtools/client/netmonitor/src/connector/firefox-connector.js
index 386b2ec7c3dd..a8e23c5aa171 100644
--- a/devtools/client/netmonitor/src/connector/firefox-connector.js
+++ b/devtools/client/netmonitor/src/connector/firefox-connector.js
@@ -104,7 +104,6 @@ class FirefoxConnector {
     this.removeListeners();
 
     this.currentTarget.off("will-navigate", this.willNavigate);
-    this.currentTarget.off("navigate", this.navigate);
 
     this.webConsoleFront = null;
     this.dataProvider = null;
@@ -133,7 +132,6 @@ class FirefoxConnector {
     // Paused network panel should be automatically resumed when page
     // reload, so `will-navigate` listener needs to be there all the time.
     targetFront.on("will-navigate", this.willNavigate);
-    targetFront.on("navigate", this.navigate);
 
     this.webConsoleFront = await this.currentTarget.getFront("console");
 
@@ -309,6 +307,10 @@ class FirefoxConnector {
       this.actions.addTimingMarker(event);
     }
 
+    if (event.name === "dom-complete") {
+      this.navigate();
+    }
+
     this.emitForTests(TEST_EVENTS.TIMELINE_EVENT, event);
   }