diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 99fcebc4a..6a9ee5997 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -753,16 +753,15 @@ S32 LLVertexBuffer::determineUsage(S32 usage)
 	if (LLRender::sGLCoreProfile)
 	{ //MUST use VBOs for all rendering
 		if(!usage)
-			usage = GL_STREAM_DRAW_ARB;
+			return GL_STREAM_DRAW_ARB;
 	}
-	else if (!sEnableVBOs || !usage)
+	else if (!sEnableVBOs || !usage || (!sUseStreamDraw && usage == GL_STREAM_DRAW_ARB))
 	{
 		return 0;
 	}
-	
 	//Only stream_draw and dynamic_draw are supported when using VBOs, dynamic draw is the default.
-	//Always use stream_draw VBO if mapping is disabled, or stream is enabled and preferred/expected
-	if( sDisableVBOMapping || (sUseStreamDraw && (sPreferStreamDraw || usage == GL_STREAM_DRAW_ARB)))
+	//Always use stream_draw VBO if mapping is disabled, or stream is preferred or expected
+	if( sDisableVBOMapping || sPreferStreamDraw || (usage == GL_STREAM_DRAW_ARB))
 	{
 		return GL_STREAM_DRAW_ARB;
 	}
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 1cdd74902..55f6a70f0 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11379,17 +11379,6 @@
       <string>Boolean</string>
       <key>Value</key>
       <integer>1</integer>
-    </map>
-  <key>RenderUseStreamVBO</key>
-  <map>
-    <key>Comment</key>
-    <string>Use VBO's for stream buffers</string>
-    <key>Persist</key>
-    <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
     </map>
 	<key>RenderPreferStreamDraw</key>
 	<map>