diff --git a/package.json b/package.json
index 84b08d9a5ab2b4afd6b4639e507a2c58fd4e9764..95b04a6073d46ef12bfce28af145e42bd741ad9d 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "jsonschema": "^1.2.2",
     "moving-average": "^1.0.0",
     "naf-janus-adapter": "^0.10.1",
-    "networked-aframe": "https://github.com/mozillareality/networked-aframe#bug/aframe-initialization-race-condition",
+    "networked-aframe": "https://github.com/mozillareality/networked-aframe#mr-social-client/master",
     "nipplejs": "https://github.com/mozillareality/nipplejs#mr-social-client/master",
     "phoenix": "^1.3.0",
     "query-string": "^5.0.1",
diff --git a/yarn.lock b/yarn.lock
index 49626b04509d15282f5a2194385c7c55aec7be30..897e85dfb58efe6c5cabc29745e164be6f274cc9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5507,9 +5507,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/mozillareality/networked-aframe#bug/aframe-initialization-race-condition":
+"networked-aframe@https://github.com/mozillareality/networked-aframe#mr-social-client/master":
   version "0.6.1"
-  resolved "https://github.com/mozillareality/networked-aframe#1d93d17f95e877cf1efcec460d7f8a4bf59c3784"
+  resolved "https://github.com/mozillareality/networked-aframe#da92fd0068e9ef7430b3970733cec17dae910505"
   dependencies:
     buffered-interpolation "^0.2.4"
     easyrtc "1.1.0"