diff --git a/Source/Engine/Renderer/LightPass.cpp b/Source/Engine/Renderer/LightPass.cpp
index e18871da9..2d9760387 100644
--- a/Source/Engine/Renderer/LightPass.cpp
+++ b/Source/Engine/Renderer/LightPass.cpp
@@ -20,14 +20,6 @@ PACK_STRUCT(struct PerFrame{
     GBufferData GBuffer;
     });
 
-LightPass::LightPass()
-    : _shader(nullptr)
-    , _psLightSkyNormal(nullptr)
-    , _psLightSkyInverted(nullptr)
-    , _sphereModel(nullptr)
-{
-}
-
 String LightPass::ToString() const
 {
     return TEXT("LightPass");
@@ -154,6 +146,7 @@ void LightPass::Dispose()
     _psLightSpotInverted.Delete();
     SAFE_DELETE_GPU_RESOURCE(_psLightSkyNormal);
     SAFE_DELETE_GPU_RESOURCE(_psLightSkyInverted);
+    SAFE_DELETE_GPU_RESOURCE(_psClearDiffuse);
     _sphereModel = nullptr;
 }
 
@@ -179,6 +172,36 @@ void LightPass::RenderLight(RenderContext& renderContext, GPUTextureView* lightB
     const bool useShadows = ShadowsPass::Instance()->IsReady() && ((view.Flags & ViewFlags::Shadows) != 0);
     const bool disableSpecular = (view.Flags & ViewFlags::SpecularLight) == 0;
 
+    // Check if debug lights
+    if (renderContext.View.Mode == ViewMode::LightBuffer)
+    {
+        // Clear diffuse
+        if (!_psClearDiffuse)
+            _psClearDiffuse = GPUDevice::Instance->CreatePipelineState();
+        auto quadShader = Content::LoadAsyncInternal<Shader>(TEXT("Shaders/Quad"));
+        if (!_psClearDiffuse->IsValid() && quadShader)
+        {
+            auto psDesc = GPUPipelineState::Description::DefaultFullscreenTriangle;
+            psDesc.BlendMode.RenderTargetWriteMask = BlendingMode::ColorWrite::RGB; // Leave AO in Alpha channel unmodified
+            psDesc.PS = quadShader->GetShader()->GetPS("PS_Clear");
+            _psClearDiffuse->Init(psDesc);
+        }
+        if (_psClearDiffuse->IsValid())
+        {
+            context->SetRenderTarget(renderContext.Buffers->GBuffer0->View());
+            auto cb = quadShader->GetShader()->GetCB(0);
+            context->UpdateCB(cb, &Color::White);
+            context->BindCB(0, cb);
+            context->SetState(_psClearDiffuse);
+            context->DrawFullscreenTriangle();
+            context->ResetRenderTarget();
+        }
+        else
+        {
+            context->Clear(renderContext.Buffers->GBuffer0->View(), Color::White);
+        }
+    }
+
     // Temporary data
     PerLight perLight;
     PerFrame perFrame;
@@ -209,13 +232,6 @@ void LightPass::RenderLight(RenderContext& renderContext, GPUTextureView* lightB
     context->BindSR(3, depthBufferSRV);
     context->BindSR(4, renderContext.Buffers->GBuffer3);
 
-    // Check if debug lights
-    if (renderContext.View.Mode == ViewMode::LightBuffer)
-    {
-        // Clear diffuse
-        context->Clear(renderContext.Buffers->GBuffer0->View(), Color::White);
-    }
-
     // Fullscreen shadow mask buffer
     GPUTexture* shadowMask = nullptr;
 #define GET_SHADOW_MASK() \
diff --git a/Source/Engine/Renderer/LightPass.h b/Source/Engine/Renderer/LightPass.h
index 149277f4b..9ecc52634 100644
--- a/Source/Engine/Renderer/LightPass.h
+++ b/Source/Engine/Renderer/LightPass.h
@@ -14,28 +14,18 @@
 class LightPass : public RendererPass<LightPass>
 {
 private:
-
-    // Lights
     AssetReference<Shader> _shader;
     GPUPipelineStatePermutationsPs<2> _psLightDir;
     GPUPipelineStatePermutationsPs<4> _psLightPointNormal;
     GPUPipelineStatePermutationsPs<4> _psLightPointInverted;
     GPUPipelineStatePermutationsPs<4> _psLightSpotNormal;
     GPUPipelineStatePermutationsPs<4> _psLightSpotInverted;
-    GPUPipelineState* _psLightSkyNormal;
-    GPUPipelineState* _psLightSkyInverted;
-
-    // Msc
+    GPUPipelineState* _psLightSkyNormal = nullptr;
+    GPUPipelineState* _psLightSkyInverted = nullptr;
+    GPUPipelineState* _psClearDiffuse = nullptr;
     AssetReference<Model> _sphereModel;
     PixelFormat _shadowMaskFormat;
 
-public:
-
-    /// <summary>
-    /// Init
-    /// </summary>
-    LightPass();
-
 public:
 
     /// <summary>