diff --git a/client/src/views/client/ClientView.jsx b/client/src/views/client/ClientView.jsx
index 3c003e00a..bb51503e7 100644
--- a/client/src/views/client/ClientView.jsx
+++ b/client/src/views/client/ClientView.jsx
@@ -45,7 +45,7 @@ function ClientView(props) {
           />
           <TabPage
             name={getTranslation(null, 'navbar.vc')}
-            hidden={!props.voiceReady}
+            hidden={(!props.voiceReady && !props.voiceLoading && !props.voiceError)}
             buttonContent={<IconMemos.VoiceChat />}
             content={<VoicePageMemo />}
             subtext={props.voicePeerCount > 0 ? `${props.voicePeerCount} ${
@@ -100,6 +100,8 @@ function mapStateToProps(state) {
     fixedFooter: state.fixedFooter,
     loadingOverlay: state.loadingOverlay,
     voiceReady: state.voiceState.ready,
+    voiceLoading: state.voiceState.loading,
+    voiceError: state.voiceState.failedGeneric,
     voicePeerCount: Object.keys(state.voiceState.peers).length,
     browserSupportIsLimited: state.browserSupportIsLimited,
     navbarDetails: state.navbarDetails,
diff --git a/client/src/views/client/pages/voice/VoicePage.jsx b/client/src/views/client/pages/voice/VoicePage.jsx
index 7f9e4d831..5b039a337 100644
--- a/client/src/views/client/pages/voice/VoicePage.jsx
+++ b/client/src/views/client/pages/voice/VoicePage.jsx
@@ -1,4 +1,3 @@
-/* eslint-disable */
 import React from 'react';
 import { connect } from 'react-redux';
 import {
@@ -125,7 +124,6 @@ function ActionCard({
 }
 
 function VoicePage({ voiceState, color }) {
-
   if (voiceState.failedGeneric) {
     return <VoiceErrorState color={color} errorMessage={voiceState.failedErrorContext} />;
   }