diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 87b4ee99e0..483e4ed3bc 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -11728,7 +11728,10 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
 
 	avatar->setImpostorDim(tdim);
 
-	LLVOAvatar::sUseImpostors = true; // @TODO ???
+	// <FS:Ansariel> FIRE-20333: Set back to correct value depending on sMaxNonImpostors
+	//LLVOAvatar::sUseImpostors = true; // @TODO ???
+	LLVOAvatar::sUseImpostors = (0 != LLVOAvatar::sMaxNonImpostors);
+	// </FS:Ansariel>
 	sUseOcclusion = occlusion;
 	sReflectionRender = FALSE;
 	sImpostorRender = FALSE;