index c0a0680..b7d4dab 100644
--- a/src/client/renderer/r_surface.c
+++ b/src/client/renderer/r_surface.c
@@ -39,15 +39,17 @@ void R_SetSurfaceBumpMappingParameters (const mBspSurface_t *surf, const image_t

        assert(surf);

-       if (normalMap && (surf->flags & MSURF_LIGHTMAP)) {
+       if (surf->flags & MSURF_LIGHTMAP) {
                const image_t *image = surf->texinfo->image;
                R_BindDeluxemapTexture(surf->deluxemap_texnum);
+       }
+
+       if (normalMap)
                R_EnableBumpmap(normalMap, qtrue);
-               R_UseMaterial(&image->material);
-       } else {
+       else
                R_EnableBumpmap(NULL, qfalse);
-               R_UseMaterial(NULL);
-       }
+
+       R_UseMaterial(&image->material);
 }

 /**