diff --git a/.eslintrc.json b/.eslintrc.json
index 3b18da5066a..268f546a50a 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -61,6 +61,13 @@
         "ecmaVersion": 8
       }
     },
+    {
+      /* This module uses ES8 async / await due to WebXR Anchor Module integration */
+      "files": ["./src/components/hand-tracking-controls.js"],
+      "parserOptions": {
+        "ecmaVersion": 6
+      }
+    },
     {
       /* This code is external, and the ES5 restrictions do not apply to it. */
       "files": ["./src/lib/**/*.js"],
diff --git a/src/components/hand-tracking-controls.js b/src/components/hand-tracking-controls.js
index d628400b8bd..26f82fea49b 100644
--- a/src/components/hand-tracking-controls.js
+++ b/src/components/hand-tracking-controls.js
@@ -188,14 +188,13 @@ module.exports.Component = registerComponent('hand-tracking-controls', {
   updateHandMeshModel: (function () {
     var jointPose = new THREE.Matrix4();
     return function () {
+      var i = 0;
       var jointPoses = this.jointPoses;
       var controller = this.el.components['tracked-controls'] && this.el.components['tracked-controls'].controller;
       if (!controller || !this.mesh) { return; }
       this.mesh.visible = false;
       if (!this.hasPoses) { return; }
-      var inputjoints = controller.hand.values();
-      for (var i = 0; i < inputjoints.length; i++) {
-        var inputjoint = inputjoints[i];
+      for (var inputjoint of controller.hand.values()) {
         var bone = this.getBone(inputjoint.jointName);
         if (bone != null) {
           this.mesh.visible = true;