1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index a57c657705..e88c05616d 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -1744,6 +1744,12 @@ bool LLVivoxVoiceClient::waitForChannel()
             return false;
         }
 
+        if (sShuttingDown)
+        {
+            logoutOfVivox(true);
+            return false;
+        }
+
         if (LLVoiceClient::instance().getVoiceEffectEnabled())
         {
             retrieveVoiceFonts();