diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index daed99a41f..60bdcb9e34 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -223,7 +223,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private void ActOnEmptyQueue()
         {
-            while (true)
+            while (IsConnected)
             {
                 m_queueEmptyEvent.WaitOne();
                 FireQueueEmpty(m_categories);