diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index c8945d8463..78c39eaa23 100755
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -134,6 +134,11 @@ void display_startup()
 		return; 
 	}
 
+	// <FS:ND> Once at and past STATE_PRECACHE display() kicks in and starts to draw, we can safely eit here.
+	if (LLStartUp::getStartupState() >= STATE_PRECACHE)
+		return;
+	// </FS:ND>
+	
 	gPipeline.updateGL();
 
 	// Update images?