diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index 48632f9012837d6167914a690f15d9277a349538..5ac53fded324dbb6dacb99e2bc07b92c6171c929 100644
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -77,8 +77,8 @@ S32 LLDrawPoolAlpha::getNumPostDeferredPasses()
 	{ //skip depth buffer filling pass when rendering impostors
 		return 1;
 	}
-//	//BD - Include Alphas In DoF
-	else if (gSavedSettings.getBOOL("RenderDepthOfField")
+//	//BD - Include Alphas In DoF and Volumetric Lighting if we want to.
+	else if ((gPipeline.RenderDepthOfField || gPipeline.RenderGodrays)
 			&& gSavedSettings.getBOOL("RenderDepthOfFieldAlphas"))
 	{
 		return 2;