diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f9b89fbe41..44ee453e41 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1232,9 +1232,6 @@ namespace OpenSim.Region.Framework.Scenes
 
                 while (!shuttingdown)
                     Update(-1);
-
-                m_lastUpdate = Util.EnvironmentTickCount();
-                m_firstHeartbeat = false;
             }
             finally
             {
@@ -1441,6 +1438,9 @@ namespace OpenSim.Region.Framework.Scenes
                 if (maintc > 0)
                     Thread.Sleep(maintc);
 
+                m_lastUpdate = Util.EnvironmentTickCount();
+                m_firstHeartbeat = false;
+
                 // Optionally warn if a frame takes double the amount of time that it should.
 //                if (Util.EnvironmentTickCountSubtract(m_lastFrameTick, previousFrameTick) > (int)(MinFrameTime * 1000 * 2))
 //                    m_log.WarnFormat(