diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 37a29cd707..d48601ecc7 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -2803,7 +2803,8 @@ void LLPanelPreferenceOpensim::apply()
 
 void LLPanelPreferenceOpensim::cancel()
 {
-	LLGridManager::getInstance()->initGrids();
+	// AW: commented out for avoiding FIRE-6738
+	//LLGridManager::getInstance()->initGrids();
 }
 
 void LLPanelPreferenceOpensim::onClickAddGrid()