diff --git a/package.json b/package.json
index 37c85f02dd35c42738da0dfffed894adb1812ea9..93154d2d912d0d40d3ff8a067326064c206d46b5 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": "https://github.com/mozillareality/networked-aframe#mr-social-client/master",
     "nipplejs": "^0.6.7",
     "query-string": "^5.0.1",
     "raven-js": "^3.20.1",
diff --git a/src/components/networked-counter.js b/src/components/networked-counter.js
index 9c4fb7105578b49b48d5abe61e4c92193a0aaede..39f76ddb7fb31482e86ddf4630f5d45d14c0d4e0 100644
--- a/src/components/networked-counter.js
+++ b/src/components/networked-counter.js
@@ -32,7 +32,7 @@ AFRAME.registerComponent("networked-counter", {
     }
 
     const id = NAF.utils.getNetworkId(networkedEl);
-    if (this.queue.hasOwnProperty(id)) {
+    if (id && this.queue.hasOwnProperty(id)) {
       return;
     }
 
@@ -61,7 +61,7 @@ AFRAME.registerComponent("networked-counter", {
 
   deregister: function(networkedEl) {
     const id = NAF.utils.getNetworkId(networkedEl);
-    if (this.queue.hasOwnProperty(id)) {
+    if (id && this.queue.hasOwnProperty(id)) {
       const item = this.queue[id];
       networkedEl.removeEventListener(this.data.grab_event, item.onGrabHandler);
       networkedEl.removeEventListener(this.data.release_event, item.onReleaseHandler);
diff --git a/src/hub.html b/src/hub.html
index b7ad91d9dc1ea329eabb37f737aa9205e7d691d5..a18d5159b09230df5eca4a3a42df5fabac8c74c1 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -183,6 +183,15 @@
         <!-- Interactables -->
         <a-entity id="counter" networked-counter="max: 3; ttl: 120"></a-entity>
 
+        <a-entity 
+            gltf-model-plus="src: #interactable-duck"
+            scale="2 2 2"
+            class="interactable" 
+            super-spawner="template: #interactable-template;" 
+            position="2.5 1.2 0" 
+            body="mass: 0; type: static; shape: box;"
+        ></a-entity>
+
         <a-entity
             id="super-cursor"
             super-cursor="cursor: #3d-cursor; camera: #player-camera;"
diff --git a/yarn.lock b/yarn.lock
index 3700485ccf05f997515f8417ec2e63e4963816fd..41b0864f101f538ab31881607f082cfbc8b50cd7 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":
-  version "0.6.0"
-  resolved "https://github.com/networked-aframe/networked-aframe#be5b2e949ec63fc44a1c6ab40b627cee5fda057e"
+"networked-aframe@https://github.com/mozillareality/networked-aframe#mr-social-client/master":
+  version "0.5.1"
+  resolved "https://github.com/mozillareality/networked-aframe#5d2f50ddf65140f0ae671b2b53c1c667de18dca5"
   dependencies:
     aframe-lerp-component "^1.1.0"
     easyrtc "1.1.0"