diff --git a/OpenSim/Framework/Monitoring/JobEngine.cs b/OpenSim/Framework/Monitoring/JobEngine.cs
index 7709f629aa..df6b806b4c 100644
--- a/OpenSim/Framework/Monitoring/JobEngine.cs
+++ b/OpenSim/Framework/Monitoring/JobEngine.cs
@@ -136,7 +136,8 @@ namespace OpenSim.Framework.Monitoring
                     if(m_jobQueue.Count <= 0)
                         m_cancelSource.Cancel();
 
-                    m_finishedProcessingAfterStop.WaitOne(RequestProcessTimeoutOnStop);
+                    if(m_finishedProcessingAfterStop.WaitOne(RequestProcessTimeoutOnStop))
+                        m_finishedProcessingAfterStop.Close();
                 }
                 finally
                 {