diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d4bfd46d77..2815f290e0 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1220,10 +1220,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             try
             {
-                Update();
-
-                m_lastUpdate = Util.EnvironmentTickCount();
-                m_firstHeartbeat = false;
+                while (!shuttingdown)
+                    Update();
             }
             catch (ThreadAbortException)
             {
@@ -1410,7 +1408,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             // Tell the watchdog that this thread is still alive
             Watchdog.UpdateThread();
-        }        
+        }
 
         public void AddGroupTarget(SceneObjectGroup grp)
         {