diff --git a/OpenSim/Region/Framework/Scenes/GodController.cs b/OpenSim/Region/Framework/Scenes/GodController.cs
index e990831393..e1fa4a8417 100644
--- a/OpenSim/Region/Framework/Scenes/GodController.cs
+++ b/OpenSim/Region/Framework/Scenes/GodController.cs
@@ -242,8 +242,8 @@ namespace OpenSim.Region.Framework.Scenes
                 OSDMap s = (OSDMap)state;
                 if (s.TryGetValue("ViewerUiIsGod", out OSD tmp))
                     newstate = tmp.AsBoolean();
-                m_lastLevelToViewer = newstate ? 200 : m_viewergodlevel;
-            }       
+                m_lastLevelToViewer = newstate && m_viewergodlevel < 200 ? 200 : m_viewergodlevel;
+            }
             UpdateGodLevels(newstate);
         }