diff --git a/src/hub.js b/src/hub.js
index 1e0af568b454a87fef89470404164250250b13b6..dc9ab1bdc525faf7a56e4619da415017da5a4b38 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -263,7 +263,7 @@ async function handleHubChannelJoined(entryManager, hubChannel, data) {
 
   document
     .querySelector("#hud-hub-entry-link")
-    .setAttribute("text", { value: `hub.link/${hub.hub_id}`, width: 1.1, align: "center" });
+    .setAttribute("text", { value: `hub.link/${hub.entry_code}`, width: 1.1, align: "center" });
 
   scene.setAttribute("networked-scene", {
     room: hub.hub_id,
diff --git a/src/react-components/link-root.js b/src/react-components/link-root.js
index be652f7b18d42a88f9cd9594cecdf46074c7e7b0..e06442749445204c858846428f548e526a38c3d8 100644
--- a/src/react-components/link-root.js
+++ b/src/react-components/link-root.js
@@ -249,17 +249,20 @@ class LinkRoot extends Component {
             </div>
 
             <div className={styles.footer}>
-              <div
-                className={styles.linkHeadsetFooterLink}
-                style={{ visibility: this.state.isAlphaMode ? "hidden" : "visible" }}
-              >
-                <img onClick={() => this.toggleMode()} src={HeadsetIcon} className={styles.headsetIcon} />
-                <span>
-                  <a href="#" onClick={() => this.toggleMode()}>
-                    <FormattedMessage id="link.linking_a_headset" />
-                  </a>
-                </span>
-              </div>
+              {!this.state.isAlphaMode &&
+                this.props.showHeadsetLinkOption && (
+                  <div
+                    className={styles.linkHeadsetFooterLink}
+                    style={{ visibility: this.state.isAlphaMode ? "hidden" : "visible" }}
+                  >
+                    <img onClick={() => this.toggleMode()} src={HeadsetIcon} className={styles.headsetIcon} />
+                    <span>
+                      <a href="#" onClick={() => this.toggleMode()}>
+                        <FormattedMessage id="link.linking_a_headset" />
+                      </a>
+                    </span>
+                  </div>
+                )}
             </div>
           </div>
         </div>