diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 9f64107c46de03d0767252d0a1c328e338b8f373..ed11e7a71f6030aa94ae4cdd8f2d115a19188883 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -987,7 +987,7 @@ void LLPanelLogin::onClickConnect(bool commit_fields)
 		// the grid definitions may come from a user-supplied grids.xml, so they may not be good
 		LL_DEBUGS("AppInit")<<"grid "<<combo_val.asString()<<LL_ENDL;
 
-		LLGridManager::getInstance()->setGridChoice(combo_val.asString());
+		LLGridManager::getInstance()->setGridChoice(combo_val.asString(), true, true);
 
 		// The start location SLURL has already been sent to LLStartUp::setStartSLURL
 
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index 70ffcbf1306cce904869c79e7a4f4b512839c1d4..9030601dd5924310fdf61e260ee53461996fa555 100644
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -680,7 +680,7 @@ std::map<std::string, std::string> LLGridManager::getKnownGrids() const
 	return result;
 }
 
-void LLGridManager::setGridChoice(const std::string& grid, const bool only_select /* = true */)
+void LLGridManager::setGridChoice(const std::string& grid, const bool only_select /* = true */, const bool for_login /* = false */)
 {
 	// Can't change grid once we are logged in
 	if (mLoggedIn) return;
@@ -719,7 +719,8 @@ void LLGridManager::setGridChoice(const std::string& grid, const bool only_selec
 		// the grid was not in the list of grids.
 		LL_WARNS("GridManager")<<"unknown grid "<<grid<<LL_ENDL;
 	}
-	mGridListChangedSignal();
+	if(!for_login)
+		mGridListChangedSignal();
 }
 
 std::string LLGridManager::getGrid(const std::string& grid) const
diff --git a/indra/newview/llviewernetwork.h b/indra/newview/llviewernetwork.h
index 7e2f06bdf14fc4c30235379da1e69d0a99cd820f..b771fff8a28ac585d30292532a6f48ad35ce0d27 100644
--- a/indra/newview/llviewernetwork.h
+++ b/indra/newview/llviewernetwork.h
@@ -225,7 +225,7 @@ class LLGridManager final : public LLSingleton<LLGridManager>
 	 */
 
 	/// Select a given grid as the current grid.
-	void setGridChoice(const std::string& grid, const bool only_select = true);
+	void setGridChoice(const std::string& grid, const bool only_select = true, const bool for_login = false);
 
 	/// Returns the name of the currently selected grid 
 	std::string getGrid() const { return mGrid; }