diff --git a/src/engine/renderer/tr_shade.cpp b/src/engine/renderer/tr_shade.cpp
index faff8eaff6..6950c8d17c 100644
--- a/src/engine/renderer/tr_shade.cpp
+++ b/src/engine/renderer/tr_shade.cpp
@@ -900,6 +900,7 @@ void Render_generic3D( shaderStage_t *pStage )
 
 	if ( r_profilerRenderSubGroups.Get() && !( pStage->stateBits & GLS_DEPTHMASK_TRUE ) && !tr.skipSubgroupProfiler ) {
 		const uint mode = GetShaderProfilerRenderSubGroupsMode( pStage->stateBits );
+		gl_genericShader->SetUniform_ProfilerRenderSubGroups( mode );
 		if( mode == 0 ) {
 			return;
 		}
@@ -907,7 +908,6 @@ void Render_generic3D( shaderStage_t *pStage )
 		GL_State( pStage->stateBits & ~( GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS ) );
 
 		gl_genericShader->SetUniform_ProfilerZero();
-		gl_genericShader->SetUniform_ProfilerRenderSubGroups( mode );
 	}
 
 	gl_genericShader->SetRequiredVertexPointers();
@@ -1202,6 +1202,7 @@ void Render_lightMapping( shaderStage_t *pStage )
 
 	if ( r_profilerRenderSubGroups.Get() && !( pStage->stateBits & GLS_DEPTHMASK_TRUE ) ) {
 		const uint mode = GetShaderProfilerRenderSubGroupsMode( stateBits );
+		gl_lightMappingShader->SetUniform_ProfilerRenderSubGroups( mode );
 		if ( mode == 0 ) {
 			return;
 		}
@@ -1209,7 +1210,6 @@ void Render_lightMapping( shaderStage_t *pStage )
 		GL_State( stateBits & ~( GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS ) );
 
 		gl_lightMappingShader->SetUniform_ProfilerZero();
-		gl_lightMappingShader->SetUniform_ProfilerRenderSubGroups( mode );
 	}
 
 	gl_lightMappingShader->SetRequiredVertexPointers();