diff --git a/src/gl/dynlights/gl_shadowmap.cpp b/src/gl/dynlights/gl_shadowmap.cpp
index 0e997bb0e..609e09e64 100644
--- a/src/gl/dynlights/gl_shadowmap.cpp
+++ b/src/gl/dynlights/gl_shadowmap.cpp
@@ -102,7 +102,7 @@ void FShadowMap::Update()
 
 bool FShadowMap::ShadowTest(ADynamicLight *light, const DVector3 &pos)
 {
-	if (IsEnabled() && mAABBTree)
+	if (light->shadowmapped && light->radius > 0.0 && IsEnabled() && mAABBTree)
 		return mAABBTree->RayTest(light->Pos(), pos) >= 1.0f;
 	else
 		return true;