diff --git a/package-lock.json b/package-lock.json
index 76850fa..03f13aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1538,9 +1538,9 @@
       "integrity": "sha1-+w+EQdrdHosRzCRRK6eqaS1iK+E="
     },
     "aframe-state-component": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/aframe-state-component/-/aframe-state-component-6.3.1.tgz",
-      "integrity": "sha512-L+64JKz9mQW6f6ZY10OyJwyT2QHx5u9sh4xlNS1eKJD8j/BgYYvKie4rlypHxZwzp+5n9Ajy5a6LsnMynuhlOA=="
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/aframe-state-component/-/aframe-state-component-6.4.2.tgz",
+      "integrity": "sha512-bs57YrfenT1sCvpyoRgpV/N4Uge0odL3MDJbakZS2V31tw9T/NP2igBicR9s4tL8gvEHfJCQSrSKUWnTKl5wPw=="
     },
     "aframe-thumb-controls-component": {
       "version": "1.1.0",
diff --git a/package.json b/package.json
index e8de423..c86536a 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "aframe-proxy-event-component": "^2.1.0",
     "aframe-ring-shader": "^1.1.0",
     "aframe-slice9-component": "^1.0.0",
-    "aframe-state-component": "^6.2.0",
+    "aframe-state-component": "^6.4.2",
     "aframe-thumb-controls-component": "^1.1.0",
     "algoliasearch": "^3.29.0",
     "ansi-html": "0.0.7",
diff --git a/src/components/leaderboard.js b/src/components/leaderboard.js
index 94dcd51..ca36bc6 100644
--- a/src/components/leaderboard.js
+++ b/src/components/leaderboard.js
@@ -55,11 +55,12 @@ AFRAME.registerComponent('leaderboard', {
       this.checkLeaderboardQualify();
     }
 
-    if (oldData.menuSelectedChallengeId !== this.data.menuSelectedChallengeId) {
+    if (this.data.menuSelectedChallengeId &&
+        oldData.menuSelectedChallengeId !== this.data.menuSelectedChallengeId) {
       this.fetchScores(this.data.menuSelectedChallengeId);
     }
 
-    if (oldData.challengeId !== this.data.challengeId) {
+    if (this.data.challengeId && oldData.challengeId !== this.data.challengeId) {
       this.fetchScores(this.data.challengeId);
     }
   },
diff --git a/src/templates/leaderboard.html b/src/templates/leaderboard.html
index e4a8205..4ee206e 100644
--- a/src/templates/leaderboard.html
+++ b/src/templates/leaderboard.html
@@ -1,14 +1,13 @@
 
 <a-entity
   id="leaderboard"
-  class="overlay"
+  class="overlay accuracyTextCounterSubscribe"
   position="2 1.1 -1.27"
   rotation="0 -50 0"
-  bind__visible="leaderboardFetched && menuActive || isPaused || isVictory"
   bind__animation="enabled: isVictory"
-   animation="property: scale; from: 0 0 0; to: 1 1 1; easing: easeOutBack"
-  >
-<!--  animation="property: scale; from: 0 0 0; to: 1 1 1; easing: easeOutBack" -->
+  bind__scale="isVictory && '0 0 0' || '1 1 1'"
+  bind__visible="(!!menuSelectedChallenge.id || !!challenge.id) && (menuActive || isPaused || isVictory) && !genreMenuOpen"
+  animation="property: scale; from: 0 0 0; to: 1 1 1; easing: easeOutBack; startEvents: textcounterdone">
 
   <a-entity
     mixin="slice"