diff --git a/src/components/avatar-volume-controls.js b/src/components/avatar-volume-controls.js
index 952f565bbe..9654252aad 100644
--- a/src/components/avatar-volume-controls.js
+++ b/src/components/avatar-volume-controls.js
@@ -29,7 +29,7 @@ AFRAME.registerComponent("avatar-volume-controls", {
     this.onRemoteMuteUpdated = this.onRemoteMuteUpdated.bind(this);
     this.playerInfo.el.addEventListener("remote_mute_updated", this.onRemoteMuteUpdated);
     this.muteButton.object3D.visible = this.playerInfo.data.muted;
-    const volumePref = getAvatarVolumePref(this.playerInfo.playerSessionId);
+    const volumePref = getAvatarVolumePref(this.playerInfo.displayName);
     this.updateGainMultiplier(volumePref === undefined ? DEFAULT_VOLUME_BAR_MULTIPLIER : volumePref.gainMultiplier);
     this.updateLocalMuted(volumePref === undefined ? false : volumePref.muted);
   },
@@ -48,7 +48,7 @@ AFRAME.registerComponent("avatar-volume-controls", {
     this.updateVolumeLabel();
     this.el.emit("gain_multiplier_updated", { gainMultiplier });
     const isLocalMuted = APP.mutedState.has(this.audioEl);
-    updatePref && updateAvatarVolumesPref(this.playerInfo.playerSessionId, gainMultiplier, isLocalMuted);
+    updatePref && updateAvatarVolumesPref(this.playerInfo.displayName, gainMultiplier, isLocalMuted);
     // If the gainMultiplier is lowered to 0, updated muted status in local storage
     if (!gainMultiplier) {
       this.updateLocalMuted(true, true);
@@ -69,7 +69,7 @@ AFRAME.registerComponent("avatar-volume-controls", {
     this.el.emit("local_muted_updated", { muted });
     const gainMultiplier = APP.gainMultipliers.get(this.audioEl);
     const isLocalMuted = APP.mutedState.has(this.audioEl);
-    updatePref && updateAvatarVolumesPref(this.playerInfo.playerSessionId, gainMultiplier, isLocalMuted);
+    updatePref && updateAvatarVolumesPref(this.playerInfo.displayName, gainMultiplier, isLocalMuted);
   },
 
   volumeUp() {
diff --git a/src/components/player-info.js b/src/components/player-info.js
index 24c95d078a..fac43f8220 100644
--- a/src/components/player-info.js
+++ b/src/components/player-info.js
@@ -49,6 +49,7 @@ AFRAME.registerComponent("player-info", {
 
     this.isLocalPlayerInfo = this.el.id === "avatar-rig";
     this.playerSessionId = null;
+    this.displayName = null;
 
     if (!this.isLocalPlayerInfo) {
       NAF.utils.getNetworkedEntity(this.el).then(networkedEntity => {
@@ -56,6 +57,7 @@ AFRAME.registerComponent("player-info", {
         const playerPresence = window.APP.hubChannel.presence.state[this.playerSessionId];
         if (playerPresence) {
           this.permissions = playerPresence.metas[0].permissions;
+          this.displayName = playerPresence.metas[0].profile.displayName;
         }
       });
     }
diff --git a/src/react-components/icons/UserSoundOff.svg b/src/react-components/icons/UserSoundOff.svg
index 6ccf1455fd..ae4dc24831 100644
--- a/src/react-components/icons/UserSoundOff.svg
+++ b/src/react-components/icons/UserSoundOff.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="20" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_906_343)">
 <path d="M1 1L23 23" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M3.65755 6.48598C2.58444 8.10961 2 10.0247 2 12V14V18V19C2 19.7957 2.31607 20.5587 2.87868 21.1213C3.44129 21.6839 4.20435 22 5 22H6C6.79565 22 7.55871 21.6839 8.12132 21.1213C8.68393 20.5587 9 19.7957 9 19V16C9 15.2044 8.68393 14.4413 8.12132 13.8787C7.55871 13.3161 6.79565 13 6 13H4V12C4 10.5588 4.38889 9.15769 5.10854 7.93697L3.65755 6.48598ZM16.3337 13.5053C16.8234 13.1782 17.4025 13 18 13H20V12C20 9.87827 19.1571 7.84344 17.6569 6.34315C16.1566 4.84285 14.1217 4 12 4C10.5588 4 9.15769 4.38889 7.93697 5.10854L6.48598 3.65755C8.10961 2.58444 10.0247 2 12 2C14.6522 2 17.1957 3.05357 19.0711 4.92893C20.9464 6.8043 22 9.34784 22 12V14V18V19C22 19.0558 21.9984 19.1115 21.9954 19.1669L16.3337 13.5053ZM15 17.8284V19C15 19.7957 15.3161 20.5587 15.8787 21.1213C16.4413 21.6839 17.2043 22 18 22H19C19.0558 22 19.1115 21.9984 19.1669 21.9954L15 17.8284Z" fill="black"/>
diff --git a/src/react-components/icons/UserSoundOn.svg b/src/react-components/icons/UserSoundOn.svg
index d696583e54..f4650f8adc 100644
--- a/src/react-components/icons/UserSoundOn.svg
+++ b/src/react-components/icons/UserSoundOn.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="20" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M3 18V12C3 9.61305 3.94821 7.32387 5.63604 5.63604C7.32387 3.94821 9.61305 3 12 3C14.3869 3 16.6761 3.94821 18.364 5.63604C20.0518 7.32387 21 9.61305 21 12V18" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M21 19C21 19.5304 20.7893 20.0391 20.4142 20.4142C20.0391 20.7893 19.5304 21 19 21H18C17.4696 21 16.9609 20.7893 16.5858 20.4142C16.2107 20.0391 16 19.5304 16 19V16C16 15.4696 16.2107 14.9609 16.5858 14.5858C16.9609 14.2107 17.4696 14 18 14H21V19ZM3 19C3 19.5304 3.21071 20.0391 3.58579 20.4142C3.96086 20.7893 4.46957 21 5 21H6C6.53043 21 7.03914 20.7893 7.41421 20.4142C7.78929 20.0391 8 19.5304 8 19V16C8 15.4696 7.78929 14.9609 7.41421 14.5858C7.03914 14.2107 6.53043 14 6 14H3V19Z" fill="black" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/react-components/room/PeopleSidebar.js b/src/react-components/room/PeopleSidebar.js
index 33078c6c07..e69efb47ff 100644
--- a/src/react-components/room/PeopleSidebar.js
+++ b/src/react-components/room/PeopleSidebar.js
@@ -160,13 +160,20 @@ export function PeopleSidebar({
                 {person.hand_raised && <HandRaisedIcon />}
                 {<DeviceIcon title={getDeviceLabel(person.context, intl)} />}
                 {!person.context.discord && VoiceIcon && <VoiceIcon title={getVoiceLabel(person.micPresence, intl)} />}
-                <ToolTip description={getToolTipDescription(store._preferences?.avatarVoiceLevels?.[person.id]?.muted)}>
-                  {store._preferences?.avatarVoiceLevels?.[person.id]?.muted ? (
-                    <UserSoundOffIcon />
-                  ) : (
-                    <UserSoundOnIcon />
-                  )}
-                </ToolTip>
+                {!person.isMe && (
+                  <ToolTip
+                    classProp="tooltip"
+                    description={getToolTipDescription(
+                      store._preferences?.avatarVoiceLevels?.[person.profile.displayName]?.muted
+                    )}
+                  >
+                    {store._preferences?.avatarVoiceLevels?.[person.profile.displayName]?.muted ? (
+                      <UserSoundOffIcon />
+                    ) : (
+                      <UserSoundOnIcon />
+                    )}
+                  </ToolTip>
+                )}
                 <p>{getPersonName(person, intl)}</p>
                 {person.roles.owner && (
                   <StarIcon
diff --git a/src/react-components/room/PeopleSidebar.scss b/src/react-components/room/PeopleSidebar.scss
index ee3020ae6c..0288a18d27 100644
--- a/src/react-components/room/PeopleSidebar.scss
+++ b/src/react-components/room/PeopleSidebar.scss
@@ -3,7 +3,7 @@
 :local(.person) {
   font-size: theme.$font-size-sm;
   color: theme.$text1-color;
-
+  position: relative;
   & > * {
     margin-right: 8px;
 
@@ -22,3 +22,9 @@
   flex: 1;
   justify-content: flex-end;
 }
+
+:local(.tooltip) {
+  z-index: 100;
+  position: fixed;
+  position: absolute;
+}