diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index 05c7decfbdaaa62e1aa08a752bd1734f0e4d38c4..c562a5f51240f5b4b55dd291e730664cfa6f4273 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -2061,7 +2061,7 @@ void LLEnvironment::coroRequestEnvironment(S32 parcel_id, LLEnvironment::environ
     {
         LL_WARNS("ENVIRONMENT") << "Couldn't retrieve environment settings for " << ((parcel_id == INVALID_PARCEL_ID) ? ("region!") : ("parcel!")) << LL_ENDL;
     }
-    else if (LLApp::isExiting())
+    else if (LLApp::isExiting() || gDisconnected)
     {
         return;
     }
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 15accd05479f1bec1be699de931677e5019372cf..c5426c93828191cb61661140714cab11a812a86a 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -1526,6 +1526,12 @@ void LLViewerParcelMgr::processParcelOverlay(LLMessageSystem *msg, void **user)
 // static
 void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **user)
 {
+    if (LLApp::isExiting() || gDisconnected)
+    {
+        LL_DEBUGS("ParcelMgr") << "Ignoring parcel properties, shutting down" << LL_ENDL;
+        return;
+    }
+
     S32		request_result;
     S32		sequence_id;
     BOOL	snap_selection = FALSE;