diff --git a/Compositor/Classic/classic.xml b/Compositor/Classic/classic.xml
index 0a09031d9..01fde59af 100644
--- a/Compositor/Classic/classic.xml
+++ b/Compositor/Classic/classic.xml
@@ -76,6 +76,7 @@
 
   <pass n="10" include="common-scene.xml">
     <name>far</name>
+    <clear-mask>color depth</clear-mask>
     <z-near>100.0</z-near>
   </pass>
   <pass n="11" include="common-scene.xml">
diff --git a/Compositor/Classic/csm-pass.xml b/Compositor/Classic/csm-pass.xml
index ddef5c6b4..51dbfa22b 100644
--- a/Compositor/Classic/csm-pass.xml
+++ b/Compositor/Classic/csm-pass.xml
@@ -4,6 +4,7 @@
   <type>csm</type>
   <implicit-attachment-mask/>
   <effect-scheme>classic-shadow</effect-scheme>
+  <clear-mask>depth</clear-mask>
   <!-- Only render objects with the CAST_SHADOW bit flag -->
   <cull-mask>0x000004</cull-mask>
   <render-at-night>false</render-at-night>
diff --git a/Compositor/HDR/csm-pass.xml b/Compositor/HDR/csm-pass.xml
index 4f7b4092d..a76086875 100644
--- a/Compositor/HDR/csm-pass.xml
+++ b/Compositor/HDR/csm-pass.xml
@@ -4,6 +4,7 @@
   <type>csm</type>
   <implicit-attachment-mask/>
   <effect-scheme>hdr-shadow</effect-scheme>
+  <clear-mask>depth</clear-mask>
   <!-- Only render objects with the CAST_SHADOW bit flag -->
   <cull-mask>0x000004</cull-mask>
   <render-at-night>false</render-at-night>
diff --git a/Compositor/HDR/env-capture-pass.xml b/Compositor/HDR/env-capture-pass.xml
index ded034bb2..45c23512e 100644
--- a/Compositor/HDR/env-capture-pass.xml
+++ b/Compositor/HDR/env-capture-pass.xml
@@ -3,6 +3,7 @@
 <PropertyList>
   <type>scene</type>
   <effect-scheme>hdr-envmap</effect-scheme>
+  <clear-mask>depth</clear-mask>
   <!-- Only render the skydome and terrain -->
   <!-- TODO: Explicitly select the LOD level -->
   <cull-mask>0x801</cull-mask>
diff --git a/Compositor/HDR/hdr.xml b/Compositor/HDR/hdr.xml
index 3202cb590..6acb92a76 100644
--- a/Compositor/HDR/hdr.xml
+++ b/Compositor/HDR/hdr.xml
@@ -569,6 +569,7 @@
     <name>geometry</name>
     <type>scene</type>
     <effect-scheme>hdr-geometry</effect-scheme>
+    <clear-mask>depth</clear-mask>
     <cull-mask>0xfffff7ff</cull-mask>
     <attachment>
       <component>color0</component>
@@ -719,7 +720,6 @@
     <name>forward</name>
     <type>scene</type>
     <effect-scheme>hdr-forward</effect-scheme>
-    <clear-mask></clear-mask>
     <binding>
       <unit>9</unit>
       <buffer>envmap</buffer>