diff --git a/browser/devtools/webaudioeditor/test/browser.ini b/browser/devtools/webaudioeditor/test/browser.ini
index 9545b68393f..943d6476055 100644
--- a/browser/devtools/webaudioeditor/test/browser.ini
+++ b/browser/devtools/webaudioeditor/test/browser.ini
@@ -31,7 +31,6 @@ support-files =
 [browser_wa_reset-02.js]
 [browser_wa_reset-03.js]
 [browser_wa_reset-04.js]
-[browser_wa_navigate.js]
 
 [browser_wa_graph-click.js]
 [browser_wa_graph-markers.js]
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_navigate.js b/browser/devtools/webaudioeditor/test/browser_wa_navigate.js
deleted file mode 100644
index 417e8ce6bcc..00000000000
--- a/browser/devtools/webaudioeditor/test/browser_wa_navigate.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests naviating from a page to another will repopulate
- * the audio graph if both pages have an AudioContext.
- */
-
-function spawnTest() {
-  let [target, debuggee, panel] = yield initWebAudioEditor(SIMPLE_CONTEXT_URL);
-  let { panelWin } = panel;
-  let { gFront, $ } = panelWin;
-
-  reload(target);
-
-  let [actors] = yield Promise.all([
-    get3(gFront, "create-node"),
-    waitForGraphRendered(panelWin, 3, 2)
-  ]);
-
-  let { nodes, edges } = countGraphObjects(panelWin);
-  ise(nodes, 3, "should only be 3 nodes.");
-  ise(edges, 2, "should only be 2 edges.");
-
-  navigate(target, SIMPLE_NODES_URL);
-
-  let [actors] = yield Promise.all([
-    getN(gFront, "create-node", 14),
-    waitForGraphRendered(panelWin, 14, 0)
-  ]);
-
-  is($("#reload-notice").hidden, true,
-    "The 'reload this page' notice should be hidden after context found after navigation.");
-  is($("#waiting-notice").hidden, true,
-    "The 'waiting for an audio context' notice should be hidden after context found after navigation.");
-  is($("#content").hidden, false,
-    "The tool's content should reappear without closing and reopening the toolbox.");
-
-  let { nodes, edges } = countGraphObjects(panelWin);
-  ise(nodes, 14, "after navigation, should have 14 nodes");
-  ise(edges, 0, "after navigation, should have 0 edges.");
-
-  yield teardown(panel);
-  finish();
-}
diff --git a/browser/devtools/webaudioeditor/test/head.js b/browser/devtools/webaudioeditor/test/head.js
index d088c36a3cf..0f5d0cbb226 100644
--- a/browser/devtools/webaudioeditor/test/head.js
+++ b/browser/devtools/webaudioeditor/test/head.js
@@ -114,11 +114,6 @@ function reload(aTarget, aWaitForTargetEvent = "navigate") {
   return once(aTarget, aWaitForTargetEvent);
 }
 
-function navigate(aTarget, aUrl, aWaitForTargetEvent = "navigate") {
-  executeSoon(() => aTarget.activeTab.navigateTo(aUrl));
-  return once(aTarget, aWaitForTargetEvent);
-}
-
 function test () {
   Task.spawn(spawnTest).then(finish, handleError);
 }
diff --git a/toolkit/devtools/server/actors/webaudio.js b/toolkit/devtools/server/actors/webaudio.js
index 1358696f228..41529ae64b4 100644
--- a/toolkit/devtools/server/actors/webaudio.js
+++ b/toolkit/devtools/server/actors/webaudio.js
@@ -284,7 +284,6 @@ let WebAudioActor = exports.WebAudioActor = protocol.ActorClass({
 
     this._onDestroyNode = this._onDestroyNode.bind(this);
     this._onGlobalDestroyed = this._onGlobalDestroyed.bind(this);
-    this._onGlobalCreated = this._onGlobalCreated.bind(this);
   },
 
   destroy: function(conn) {
@@ -323,9 +322,6 @@ let WebAudioActor = exports.WebAudioActor = protocol.ActorClass({
       holdWeak: true,
       storeCalls: false
     });
-    // Bind to `window-ready` so we can reenable recording on the
-    // call watcher
-    on(this.tabActor, "window-ready", this._onGlobalCreated);
     // Bind to the `window-destroyed` event so we can unbind events between
     // the global destruction and the `finalize` cleanup method on the actor.
     on(this.tabActor, "window-destroyed", this._onGlobalDestroyed);
@@ -399,7 +395,6 @@ let WebAudioActor = exports.WebAudioActor = protocol.ActorClass({
     this.tabActor = null;
     this._initialized = false;
     off(this.tabActor, "window-destroyed", this._onGlobalDestroyed);
-    off(this.tabActor, "window-ready", this._onGlobalCreated);
     this._nativeToActorID = null;
     this._callWatcher.eraseRecording();
     this._callWatcher.finalize();
@@ -574,14 +569,6 @@ let WebAudioActor = exports.WebAudioActor = protocol.ActorClass({
     }
   },
 
-  /**
-   * Ensures that the new global has recording on
-   * so we can proxy the function calls.
-   */
-  _onGlobalCreated: function () {
-    this._callWatcher.resumeRecording();
-  },
-
   /**
    * Called when the underlying ContentObserver fires `global-destroyed`
    * so we can cleanup some things between the global being destroyed and