1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 9b1f54437e..59e8db7752 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -302,7 +302,16 @@ void LLVoiceClient::setHidden(bool hidden)
 
 void LLVoiceClient::terminate()
 {
-    if (mSpatialVoiceModule) mSpatialVoiceModule->terminate();
+#if !__FreeBSD__ && !_M_ARM64
+    if (LLVivoxVoiceClient::instanceExists())
+    {
+        LLWebRTCVoiceClient::getInstance()->terminate();
+    }
+#endif
+    if (LLVivoxVoiceClient::instanceExists())
+    {
+        LLVivoxVoiceClient::getInstance()->terminate();
+    }
     mSpatialVoiceModule = NULL;
     m_servicePump = NULL;