diff --git a/Compositor/Classic/csm-pass.xml b/Compositor/Classic/csm-pass.xml
index eeef4e525..ddef5c6b4 100644
--- a/Compositor/Classic/csm-pass.xml
+++ b/Compositor/Classic/csm-pass.xml
@@ -2,7 +2,7 @@
 
 <PropertyList>
   <type>csm</type>
-  <implicit-attachment-mask></implicit-attachment-mask>
+  <implicit-attachment-mask/>
   <effect-scheme>classic-shadow</effect-scheme>
   <!-- Only render objects with the CAST_SHADOW bit flag -->
   <cull-mask>0x000004</cull-mask>
diff --git a/Compositor/HDR/csm-pass.xml b/Compositor/HDR/csm-pass.xml
index 5bb603402..4f7b4092d 100644
--- a/Compositor/HDR/csm-pass.xml
+++ b/Compositor/HDR/csm-pass.xml
@@ -2,6 +2,7 @@
 
 <PropertyList>
   <type>csm</type>
+  <implicit-attachment-mask/>
   <effect-scheme>hdr-shadow</effect-scheme>
   <!-- Only render objects with the CAST_SHADOW bit flag -->
   <cull-mask>0x000004</cull-mask>
diff --git a/Compositor/HDR/env-capture-pass.xml b/Compositor/HDR/env-capture-pass.xml
index ade6496fd..231c5a950 100644
--- a/Compositor/HDR/env-capture-pass.xml
+++ b/Compositor/HDR/env-capture-pass.xml
@@ -2,7 +2,6 @@
 
 <PropertyList>
   <type>scene</type>
-  <implicit-attachment-mask>depth</implicit-attachment-mask>
   <effect-scheme>hdr-envmap</effect-scheme>
   <!-- Only render the skydome and terrain -->
   <!-- TODO: Explicitly select the LOD level -->