diff --git a/shared/rd-rend2/tr_bsp.cpp b/shared/rd-rend2/tr_bsp.cpp
index ded23514c8..7cb1d9dc35 100644
--- a/shared/rd-rend2/tr_bsp.cpp
+++ b/shared/rd-rend2/tr_bsp.cpp
@@ -4024,7 +4024,7 @@ static void R_GenerateSurfaceSprites( const world_t *world, int worldIndex )
 	for (int i = 0; i < tr.numShaders; i++)
 	{
 		const shader_t *shader = tr.shaders[i];
-		if (shader->spriteUbo != NULL)
+		if (shader->spriteUbo != -1)
 			continue;
 
 		numSpriteStages += shader->numSurfaceSpriteStages;
diff --git a/shared/rd-rend2/tr_shader.cpp b/shared/rd-rend2/tr_shader.cpp
index 68e7a9df58..2429d28c73 100644
--- a/shared/rd-rend2/tr_shader.cpp
+++ b/shared/rd-rend2/tr_shader.cpp
@@ -3802,6 +3802,7 @@ static shader_t *GeneratePermanentShader( void ) {
 	}
 
 	RB_AddShaderToShaderInstanceUBO(newShader);
+	newShader->spriteUbo = -1;
 
 	SortNewShader();