diff --git a/com.unity.render-pipelines.core/Editor/LookDev/Stage.cs b/com.unity.render-pipelines.core/Editor/LookDev/Stage.cs
index 0679af9f6f1..0f121b9bcbd 100644
--- a/com.unity.render-pipelines.core/Editor/LookDev/Stage.cs
+++ b/com.unity.render-pipelines.core/Editor/LookDev/Stage.cs
@@ -217,16 +217,28 @@ void SetGameObjectVisible(bool visible)
                 if (go == null || go.Equals(null))
                     continue;
                 foreach (UnityEngine.Renderer renderer in go.GetComponentsInChildren<UnityEngine.Renderer>())
-                    renderer.enabled = visible;
+                {
+                    if((renderer.hideFlags & HideFlags.HideInInspector) == 0 && ((renderer.hideFlags & HideFlags.HideAndDontSave) == 0))
+                        renderer.enabled = visible;
+                }
                 foreach (Light light in go.GetComponentsInChildren<Light>())
-                    light.enabled = visible;
+                {
+                    if ((light.hideFlags & HideFlags.HideInInspector) == 0 && ((light.hideFlags & HideFlags.HideAndDontSave) == 0))
+                        light.enabled = visible;
+                }
             }
 
             // in case we add camera frontal light and such
             foreach (UnityEngine.Renderer renderer in m_Camera.GetComponentsInChildren<UnityEngine.Renderer>())
-                renderer.enabled = visible;
+            {
+                if ((renderer.hideFlags & HideFlags.HideInInspector) == 0 && ((renderer.hideFlags & HideFlags.HideAndDontSave) == 0))
+                    renderer.enabled = visible;
+            }
             foreach (Light light in m_Camera.GetComponentsInChildren<Light>())
-                light.enabled = visible;
+            {
+                if ((light.hideFlags & HideFlags.HideInInspector) == 0 && ((light.hideFlags & HideFlags.HideAndDontSave) == 0))
+                    light.enabled = visible;
+            }
         }
 
         public void OnBeginRendering(IDataProvider dataProvider)
diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
index e052fab4a49..4dd1cb7665a 100644
--- a/com.unity.render-pipelines.high-definition/CHANGELOG.md
+++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -72,6 +72,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed RTGI in performance mode when light layers are enabled on the asset.
 - Fixed SSS materials appearing black in matcap mode.
 - Fixed a collision in the interaction of RTR and RTGI.
+- Fix for lookdev toggling renderers that are set to non editable or are hidden in the inspector.
 
 ### Changed
 - Preparation pass for RTSSShadows to be supported by render graph.