diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 0468057b22..f8268b4580 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -689,7 +689,14 @@ void LLVivoxVoiceClient::setLoginInfo(
         // we have an empty account server name
         // so we fall back to hardcoded defaults
 
-        if(!LLGridManager::getInstance()->isInSLBeta())
+        // <FS:TJ> In OpenSim fall back to their common default vivox server instead of LL's
+        //if(!LLGridManager::getInstance()->isInSLBeta())
+        if (!LLGridManager::getInstance()->isInSecondLife())
+        {
+            mVoiceSIPURIHostName = "osp.vivox.com";
+        }
+        else if(!LLGridManager::getInstance()->isInSLBeta())
+        // </FS:TJ>
         {
             // Use the release account server
             mVoiceSIPURIHostName = "bhr.vivox.com";