diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 11fa19cc76..3c2fc1d29e 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -1687,6 +1687,11 @@ public:
 
 	virtual void post(ResponsePtr response, const LLSD& context, const LLSD& input) const
 	{
+        if (LLApp::isExiting())
+        {
+            return;
+        }
+
 		if (!input["body"].has("agent-id") ||
 			!input["body"].has("sim-ip-and-port") ||
 			!input["body"].has("seed-capability"))