diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 5d9da37c8..32501de62 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3285,6 +3285,8 @@ bool LLAppViewer::initCache()
 	{
 		LL_WARNS("AppCache") << "Unable to set cache location" << LL_ENDL;
 		gSavedSettings.setString("CacheLocation", "");
+		// Keep NewCacheLocation equal to CacheLocation so we won't try to erase the cache the next time the viewer is run.
+		gSavedSettings.setString("NewCacheLocation", "");
 	}
 	
 	if (mPurgeCache && !read_only)