diff --git a/engine/Sandbox.Engine/Scene/Components/Camera/CameraComponent.cs b/engine/Sandbox.Engine/Scene/Components/Camera/CameraComponent.cs
index 90649ebe..1e8d0d02 100644
--- a/engine/Sandbox.Engine/Scene/Components/Camera/CameraComponent.cs
+++ b/engine/Sandbox.Engine/Scene/Components/Camera/CameraComponent.cs
@@ -381,6 +381,10 @@ public sealed partial class CameraComponent : Component, Component.ExecuteInEdit
 			return;
 
 		camera.OnRenderUI = () => OnCameraRenderUI( camera );
+		camera.OnRenderOverlay = () =>
+		{
+			if ( IsMainCamera ) Sandbox.DebugOverlay.Render();
+		};
 	}
 
 	[Obsolete( "Use CommandList" )]
diff --git a/engine/Sandbox.Engine/Systems/Render/Graphics.Hooks.cs b/engine/Sandbox.Engine/Systems/Render/Graphics.Hooks.cs
index 7ea8f2e8..4df335cf 100644
--- a/engine/Sandbox.Engine/Systems/Render/Graphics.Hooks.cs
+++ b/engine/Sandbox.Engine/Systems/Render/Graphics.Hooks.cs
@@ -18,7 +18,6 @@ public static partial class Graphics
 			using ( new Graphics.Scope( in setup ) )
 			{
 				RenderUiOverlay();
-				DebugOverlay.Render();
 			}
 
 			return;