diff --git a/mandelbulber2/opencl/engines/shader_aux_shadow.cl b/mandelbulber2/opencl/engines/shader_aux_shadow.cl
index 959bb31c9..1f03b426e 100644
--- a/mandelbulber2/opencl/engines/shader_aux_shadow.cl
+++ b/mandelbulber2/opencl/engines/shader_aux_shadow.cl
@@ -57,7 +57,8 @@ float AuxShadow(constant sClInConstants *consts, sRenderData *renderData, sShade
 	float maxSoft = 0.0f;
 
 	const bool bSoft = !consts->params.iterFogEnabled && !consts->params.common.iterThreshMode
-										 && softRange > 0.0f && !consts->params.monteCarloSoftShadows;
+										 && softRange > 0.0f
+										 && !(consts->params.monteCarloSoftShadows && consts->params.DOFMonteCarlo);
 
 #ifdef MC_SOFT_SHADOWS
 	float3 randomVector;
diff --git a/mandelbulber2/opencl/engines/shader_main_shadow.cl b/mandelbulber2/opencl/engines/shader_main_shadow.cl
index d7ef8fc98..155cae15d 100644
--- a/mandelbulber2/opencl/engines/shader_main_shadow.cl
+++ b/mandelbulber2/opencl/engines/shader_main_shadow.cl
@@ -61,7 +61,7 @@ float3 MainShadow(__constant sClInConstants *consts, sRenderData *renderData,
 
 	const bool bSoft = !consts->params.iterFogEnabled && !consts->params.common.iterThreshMode
 										 && !consts->params.interiorMode && softRange > 0.0f
-										 && !consts->params.monteCarloSoftShadows;
+										 && !(consts->params.monteCarloSoftShadows && consts->params.DOFMonteCarlo);
 
 	float3 shadowVect = input->lightVect;
 
diff --git a/mandelbulber2/src/shader_aux_shadow.cpp b/mandelbulber2/src/shader_aux_shadow.cpp
index ad889de93..3c0b7fc6d 100644
--- a/mandelbulber2/src/shader_aux_shadow.cpp
+++ b/mandelbulber2/src/shader_aux_shadow.cpp
@@ -65,7 +65,7 @@ double cRenderWorker::AuxShadow(
 	double maxSoft = 0.0;
 
 	const bool bSoft = !params->iterFogEnabled && !params->common.iterThreshMode && softRange > 0.0
-										 && !params->monteCarloSoftShadows;
+										 && !(params->monteCarloSoftShadows && params->DOFMonteCarlo);
 
 	if (params->DOFMonteCarlo && params->monteCarloSoftShadows)
 	{
diff --git a/mandelbulber2/src/shader_main_shadow.cpp b/mandelbulber2/src/shader_main_shadow.cpp
index 9e7471e8a..03763af38 100644
--- a/mandelbulber2/src/shader_main_shadow.cpp
+++ b/mandelbulber2/src/shader_main_shadow.cpp
@@ -63,7 +63,8 @@ sRGBAfloat cRenderWorker::MainShadow(const sShaderInputData &input) const
 	double maxSoft = 0.0;
 
 	const bool bSoft = !params->iterFogEnabled && !params->common.iterThreshMode
-										 && !params->interiorMode && softRange > 0.0 && !params->monteCarloSoftShadows;
+										 && !params->interiorMode && softRange > 0.0
+										 && !(params->monteCarloSoftShadows && params->DOFMonteCarlo);
 
 	CVector3 shadowVect = input.lightVect;
 	if (params->DOFMonteCarlo && params->monteCarloSoftShadows)