diff --git a/package.json b/package.json
index 37c85f02dd35c42738da0dfffed894adb1812ea9..797e07dc12cccfde740be2baa9c4f1293632259b 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "mobile-detect": "^1.4.1",
     "moving-average": "^1.0.0",
     "naf-janus-adapter": "https://github.com/mozilla/naf-janus-adapter#feature/disconnect",
-    "networked-aframe": "https://github.com/networked-aframe/networked-aframe",
+    "networked-aframe": "github:mozillareality/networked-aframe#feature/sound-source-set",
     "nipplejs": "^0.6.7",
     "query-string": "^5.0.1",
     "raven-js": "^3.20.1",
diff --git a/src/components/audio-feedback.js b/src/components/audio-feedback.js
index d4bdf5792e79cc1eb3191a0d042f59e89308956d..cc4c0741da054791cc492817ef29aa646faf40c0 100644
--- a/src/components/audio-feedback.js
+++ b/src/components/audio-feedback.js
@@ -1,20 +1,14 @@
 AFRAME.registerComponent("networked-audio-analyser", {
   schema: {},
   async init() {
-    const networkedEl = await NAF.utils.getNetworkedEntity(this.el);
-    const ownerId = networkedEl.components.networked.data.owner;
-
-    const stream = await NAF.connection.adapter.getMediaStream(ownerId);
-
-    if (!stream) {
-      return;
-    }
-
-    const ctx = THREE.AudioContext.getContext();
-    const source = ctx.createMediaStreamSource(stream);
-    this.analyser = ctx.createAnalyser();
-    this.levels = new Uint8Array(this.analyser.frequencyBinCount);
-    source.connect(this.analyser);
+    this.connected = false;
+    this.el.addEventListener("sound-source-set", event => {
+      const ctx = THREE.AudioContext.getContext();
+      this.analyser = ctx.createAnalyser();
+      this.analyser.fftSize = 32;
+      this.levels = new Uint8Array(this.analyser.frequencyBinCount);
+      event.detail.soundSource.connect(this.analyser);
+    });
   },
 
   tick: function() {
diff --git a/yarn.lock b/yarn.lock
index 3700485ccf05f997515f8417ec2e63e4963816fd..e3f42ffef9e5f9a68cf31910c24682806b8fd433 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5249,9 +5249,9 @@ neo-async@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.0.tgz#76b1c823130cca26acfbaccc8fbaf0a2fa33b18f"
 
-"networked-aframe@https://github.com/networked-aframe/networked-aframe":
+"networked-aframe@github:mozillareality/networked-aframe#feature/sound-source-set":
   version "0.6.0"
-  resolved "https://github.com/networked-aframe/networked-aframe#be5b2e949ec63fc44a1c6ab40b627cee5fda057e"
+  resolved "https://codeload.github.com/mozillareality/networked-aframe/tar.gz/978b7c25aff26a0c1db47beb35d8a6556f717d36"
   dependencies:
     aframe-lerp-component "^1.1.0"
     easyrtc "1.1.0"