diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs
index 4f6899de58..fbd79b496c 100644
--- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs
+++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs
@@ -414,8 +414,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
         {
             get
             {
-                if (m_server == null || !m_server.Synced)
-                //if((m_server == null || !m_server.Synced) && (m_sceneToSESyncServer==null || !m_sceneToSESyncServer.Synced))
+                //if (m_server == null || !m_server.Synced)
+                if((m_server == null || !m_server.Synced) && (m_sceneToSESyncServer==null || !m_sceneToSESyncServer.Synced))
                     return false;
                 return true;
             }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f93832147c..2783269ca5 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1644,7 +1644,8 @@ namespace OpenSim.Region.Framework.Scenes
 
                     int tmpPhysicsMS2 = Util.EnvironmentTickCount();
                     // Do not simulate physics locally if this is a synced client
-                    if (!IsSyncedClient())
+                    //if (!IsSyncedClient())
+                    if (IsSyncedServer())
                     {
                         if ((m_frame % m_update_physics == 0) && m_physics_enabled)
                             m_sceneGraph.UpdatePreparePhysics();
@@ -1652,7 +1653,8 @@ namespace OpenSim.Region.Framework.Scenes
                     physicsMS2 = Util.EnvironmentTickCountSubtract(tmpPhysicsMS2);
 
                     // Do not simulate physics locally if this is a synced client
-                    if (!IsSyncedClient())
+                    //if (!IsSyncedClient())
+                    if (IsSyncedServer())
                     {
                         if (m_frame % m_update_entitymovement == 0)
                             m_sceneGraph.UpdateScenePresenceMovement();
@@ -1660,7 +1662,8 @@ namespace OpenSim.Region.Framework.Scenes
 
                     int tmpPhysicsMS = Util.EnvironmentTickCount();
                     // Do not simulate physics locally if this is a synced client
-                    if (!IsSyncedClient())
+                    //if (!IsSyncedClient())
+                    if (IsSyncedServer())
                     {
                         if (m_frame % m_update_physics == 0)
                         {