diff --git a/src/components/2d-mute-state-indicator.js b/src/components/2d-mute-state-indicator.js
index d93c83bab0e54a26be03bb6caf3190213e08a289..f4997c06635d27e873e561fe9a391c70e0648b1c 100644
--- a/src/components/2d-mute-state-indicator.js
+++ b/src/components/2d-mute-state-indicator.js
@@ -42,7 +42,7 @@ AFRAME.registerComponent("2d-mute-state-indicator", {
   },
 
   onStateToggled(e) {
-    if (!e.detail.state === "muted") return;
+    if (e.detail !== "muted") return;
     this.updateMuteState();
   },
 
diff --git a/src/components/in-world-hud.js b/src/components/in-world-hud.js
index 3781379f3907e9648caa1cb1431569375145d505..9735cb0ddc7b08c8f3f4acc2fff5e3b22e96008c 100644
--- a/src/components/in-world-hud.js
+++ b/src/components/in-world-hud.js
@@ -59,14 +59,19 @@ AFRAME.registerComponent("in-world-hud", {
       this.mic.setAttribute("src", muted ? "#unmuted" : "#muted");
     };
 
+    this.showCorrectMuteState = () => {
+      const muted = this.el.sceneEl.is("muted");
+      this.mic.setAttribute("src", muted ? "#muted" : "#unmuted");
+    };
+
     this.onStateChange = evt => {
-      if (evt.detail.state !== "muted") return;
+      if (evt.detail !== "muted") return;
       this.showCorrectMuteState();
     };
-    this.showCorrectMuteState = () => {
+
+    this.onMicHoverExit = () => {
       this.hoveredOnMic = false;
-      const muted = this.el.sceneEl.is("muted");
-      this.mic.setAttribute("src", muted ? "#muted" : "#unmuted");
+      this.showCorrectMuteState();
     };
 
     this.onSelect = evt => {
@@ -82,7 +87,7 @@ AFRAME.registerComponent("in-world-hud", {
 
   play() {
     this.mic.addEventListener("raycaster-intersected", this.onMicHover);
-    this.mic.addEventListener("raycaster-intersected-cleared", this.showCorrectMuteState);
+    this.mic.addEventListener("raycaster-intersected-cleared", this.onMicHoverExit);
 
     this.nametag.addEventListener("raycaster-intersected", this.addBlue);
     this.nametag.addEventListener("raycaster-intersected-cleared", this.removeBlue);
@@ -102,7 +107,7 @@ AFRAME.registerComponent("in-world-hud", {
     this.nametag.removeEventListener("raycaster-intersected-cleared", this.removeBlue);
 
     this.mic.removeEventListener("raycaster-intersected", this.onMicHover);
-    this.mic.removeEventListener("raycaster-intersected-cleared", this.showCorrectMuteState);
+    this.mic.removeEventListener("raycaster-intersected-cleared", this.onMicHoverExit);
 
     this.avatar.removeEventListener("raycaster-intersected", this.flipX);
     this.avatar.removeEventListener("raycaster-intersected-cleared", this.unflipX);