diff --git a/OpenSim/Region/Framework/Scenes/GodController.cs b/OpenSim/Region/Framework/Scenes/GodController.cs
index d45f5603f0..abdbe51eec 100644
--- a/OpenSim/Region/Framework/Scenes/GodController.cs
+++ b/OpenSim/Region/Framework/Scenes/GodController.cs
@@ -141,7 +141,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (!shoudBeGod)
                 godLevel = 0;
 
-            if (m_viewerUiIsGod != shoudBeGod)
+            if (m_viewerUiIsGod != shoudBeGod && (!m_scenePresence.IsChildAgent))
             {
                 m_scenePresence.ControllingClient.SendAdminResponse(UUID.Zero, (uint)godLevel);
                 m_viewerUiIsGod = shoudBeGod;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 38e46e7f06..28b2f528e4 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1290,6 +1290,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 IsChildAgent = false;
+                GodController.SyncViewerState();
             }
 
             m_log.DebugFormat("[MakeRootAgent] out lock: {0}ms", Util.EnvironmentTickCountSubtract(ts));