diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 02dbf4d84b..c82dff4cea 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -555,7 +555,10 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 	// Bail out if we're in the startup state and don't want to try to
 	// render the world.
 	//
-	if (LLStartUp::getStartupState() < STATE_PRECACHE)
+	// <FS:Ansariel> Revert to original state to prevent flickering if login progress screen is disabled
+	//if (LLStartUp::getStartupState() < STATE_PRECACHE)
+	if (LLStartUp::getStartupState() < STATE_STARTED)
+	// </FS:Ansariel>
 	{
 		LLAppViewer::instance()->pingMainloopTimeout("Display:Startup");
 		display_startup();