diff --git a/Source/Engine/Debug/DebugDraw.cpp b/Source/Engine/Debug/DebugDraw.cpp
index a1dfa0b61..d64494125 100644
--- a/Source/Engine/Debug/DebugDraw.cpp
+++ b/Source/Engine/Debug/DebugDraw.cpp
@@ -632,9 +632,10 @@ void DebugDrawService::Update()
         desc.VS = shader->GetVS("VS");
 
         // Default
-        desc.PS = shader->GetPS("PS");
+        desc.PS = shader->GetPS("PSUnlit");
         desc.PrimitiveTopologyType = PrimitiveTopologyType::Line;
         failed |= DebugDrawPsLinesDefault.Create(desc);
+        desc.PS = shader->GetPS("PS");
         desc.PrimitiveTopologyType = PrimitiveTopologyType::Triangle;
         failed |= DebugDrawPsTrianglesDefault.Create(desc);
         desc.Wireframe = true;
@@ -642,9 +643,10 @@ void DebugDrawService::Update()
 
         // Depth Test
         desc.Wireframe = false;
-        desc.PS = shader->GetPS("PS_DepthTest");
+        desc.PS = shader->GetPS("PS_DepthTestUnlit");
         desc.PrimitiveTopologyType = PrimitiveTopologyType::Line;
         failed |= DebugDrawPsLinesDepthTest.Create(desc);
+        desc.PS = shader->GetPS("PS_DepthTest");
         desc.PrimitiveTopologyType = PrimitiveTopologyType::Triangle;
         failed |= DebugDrawPsTrianglesDepthTest.Create(desc);
         desc.Wireframe = true;
diff --git a/Source/Shaders/DebugDraw.shader b/Source/Shaders/DebugDraw.shader
index 34d1b9108..8782abe4b 100644
--- a/Source/Shaders/DebugDraw.shader
+++ b/Source/Shaders/DebugDraw.shader
@@ -54,9 +54,22 @@ float4 PS(VS2PS input) : SV_Target
 	return PerformFakeLighting(input.Position, input.Color);
 }
 
+META_PS(true, FEATURE_LEVEL_ES2)
+float4 PSUnlit(VS2PS input) : SV_Target
+{
+	return input.Color;
+}
+
 META_PS(true, FEATURE_LEVEL_ES2)
 float4 PS_DepthTest(VS2PS input) : SV_Target
 {
 	PerformDepthTest(input.Position);
 	return PerformFakeLighting(input.Position, input.Color);
 }
+
+META_PS(true, FEATURE_LEVEL_ES2)
+float4 PS_DepthTestUnlit(VS2PS input) : SV_Target
+{
+	PerformDepthTest(input.Position);
+	return input.Color;
+}