diff --git a/src/components/hand-poses.js b/src/components/hand-poses.js
index 16d1f1479af6f4f4e17963084e6e135ecb82b942..ae717a44565ac6a81ea6bccaa1f81059e49d7086 100644
--- a/src/components/hand-poses.js
+++ b/src/components/hand-poses.js
@@ -11,13 +11,32 @@ const POSES = {
 
 const NETWORK_POSES = ["allOpen", "thumbDown", "indexDown", "mrpDown", "thumbsUp", "point", "allGrip", "pinch"];
 
-AFRAME.registerComponent("hand-pose", {
+AFRAME.registerComponent("hand-pose-state", {
   multiple: true,
   schema: {
     pose: { default: 0 }
   },
+  init() {
+    this.setSelfAsStore = this.setSelfAsStore.bind(this);
+    this.setSelfAsStore();
+  },
+  setSelfAsStore() {
+    let poseEl = this.el.querySelector(`[hand-pose__${this.id}]`);
+    if (!poseEl) {
+      window.setTimeout(() => {
+        this.setSelfAsStore();
+      }, 3000);
+      return;
+    }
+    poseEl.components[`hand-pose__${this.id}`].store = this;
+  }
+});
+
+AFRAME.registerComponent("hand-pose", {
+  multiple: true,
 
   init() {
+    this.pose = 0;
     this.animatePose = this.animatePose.bind(this);
     this.mixer = this.el.components["animation-mixer"];
     const object3DMap = this.mixer.el.object3DMap;
@@ -28,9 +47,11 @@ AFRAME.registerComponent("hand-pose", {
     this.from.play();
   },
 
-  update(oldData) {
-    if (oldData.pose != this.data.pose) {
-      this.animatePose(NETWORK_POSES[oldData.pose || 0], NETWORK_POSES[this.data.pose]);
+  tick() {
+    if (!this.store) return;
+    if (this.store.data.pose != this.pose) {
+      this.animatePose(NETWORK_POSES[this.pose], NETWORK_POSES[this.store.data.pose]);
+      this.pose = this.store.data.pose;
     }
   },
 
@@ -55,7 +76,8 @@ AFRAME.registerComponent("hand-pose", {
 AFRAME.registerComponent("hand-pose-controller", {
   multiple: true,
   schema: {
-    eventSrc: { type: "selector" }
+    eventSrc: { type: "selector" },
+    store: { type: "selector" }
   },
   init: function() {
     this.setHandPose = this.setHandPose.bind(this);
@@ -70,6 +92,10 @@ AFRAME.registerComponent("hand-pose-controller", {
   },
 
   setHandPose: function(evt) {
-    this.el.setAttribute(`hand-pose__${this.id}`, "pose", NETWORK_POSES.indexOf(POSES[evt.detail.current]));
+    this.data.store.setAttribute(
+      `hand-pose-state__${this.id}`,
+      "pose",
+      NETWORK_POSES.indexOf(POSES[evt.detail.current])
+    );
   }
 });
diff --git a/src/hub.html b/src/hub.html
index edb7395d4641f10c27994b3399dc580e72f6952b..c90b81e036181ef2c659172f4d6494e3a87afb53 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -62,7 +62,7 @@
 
                     <a-entity class="right-controller"></a-entity>
 
-                    <a-entity class="model" gltf-model-plus="inflate: true">
+                    <a-entity class="model" hand-pose-state__left hand-pose-state__right gltf-model-plus="inflate: true">
                         <template data-selector=".RootScene">
                             <a-entity ik-controller hand-pose__left hand-pose__right animation-mixer space-invader-mesh="meshSelector: .Bot_Skinned"></a-entity>
                         </template>
@@ -224,15 +224,18 @@
                 app-mode-toggle-attribute__line="mode: hud; property: visible;"
             ></a-entity>
 
-            <a-entity gltf-model-plus="inflate: true;" class="model">
+            <a-entity gltf-model-plus="inflate: true;"
+                      hand-pose-state__left
+                      hand-pose-state__right
+                      class="model">
                 <template data-selector=".RootScene">
                     <a-entity
                         ik-controller
                         animation-mixer
                         hand-pose__left
                         hand-pose__right
-                        hand-pose-controller__left="eventSrc:#player-left-controller"
-                        hand-pose-controller__right="eventSrc:#player-right-controller"
+                        hand-pose-controller__left="store:#player-rig [hand-pose-state__left];eventSrc:#player-left-controller"
+                        hand-pose-controller__right="store:#player-rig [hand-pose-state__right];eventSrc:#player-right-controller"
                     ></a-entity>
                 </template>
 
diff --git a/src/network-schemas.js b/src/network-schemas.js
index 822951bedb782de1ba401ae20c00232f47b61412..00e212c214bd4f08e7acb0c1225f4a9a2d642511 100644
--- a/src/network-schemas.js
+++ b/src/network-schemas.js
@@ -10,13 +10,13 @@ function registerNetworkSchemas() {
       "scale",
       "player-info",
       {
-        selector: ".RootScene",
-        component: "hand-pose__left",
+        selector: ".model",
+        component: "hand-pose-state__left",
         property: "pose"
       },
       {
-        selector: ".RootScene",
-        component: "hand-pose__right",
+        selector: ".model",
+        component: "hand-pose-state__right",
         property: "pose"
       },
       {
diff --git a/src/react-components/ui-root.js b/src/react-components/ui-root.js
index 512cb62c14750d01c8cd9cbbff7c3bc2b8b9cc6d..6e575dcfa4848241647cc6b028b2dbba58a72058 100644
--- a/src/react-components/ui-root.js
+++ b/src/react-components/ui-root.js
@@ -103,7 +103,6 @@ class UIRoot extends Component {
 
   componentDidMount() {
     this.setupTestTone();
-    this.props.concurrentLoadDetector.addEventListener("concurrentload", this.onConcurrentLoad);
     this.micLevelMovingAverage = MovingAverage(100);
     this.props.scene.addEventListener("loaded", this.onSceneLoaded);
     this.props.scene.addEventListener("stateadded", this.onAframeStateChanged);