diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index 3007265d2168b9aca36e6d4aa4a1ad31a7760835..95a136d6682042584734a1e5f5601da22328c7aa 100644
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -1131,9 +1131,13 @@ std::string LLGridManager::getSLURLBase(const std::string& grid) const
 		}
 		else
 		{
-			grid_base = llformat(DEFAULT_SLURL_BASE, grid.c_str());
+			grid_base = llformat(DEFAULT_SLURL_BASE, grid_name.c_str());
 		}
 	}
+	else
+	{
+		grid_base = llformat(DEFAULT_SLURL_BASE, grid.c_str());
+	}
 	LL_DEBUGS("GridManager")<<"returning '"<<grid_base<<"'"<<LL_ENDL;
 	return grid_base;
 }
@@ -1151,9 +1155,13 @@ std::string LLGridManager::getAppSLURLBase(const std::string& grid) const
 		}
 		else
 		{
-			grid_base = llformat(DEFAULT_APP_SLURL_BASE, grid.c_str());
+			grid_base = llformat(DEFAULT_APP_SLURL_BASE, grid_name.c_str());
 		}
 	}
+	else
+	{
+		grid_base = llformat(DEFAULT_APP_SLURL_BASE, grid.c_str());
+	}
 	LL_DEBUGS("GridManager")<<"returning '"<<grid_base<<"'"<<LL_ENDL;
 	return grid_base;
 }