diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7e7a1a004f..c9de573674 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13577,7 +13577,7 @@ Change of this parameter will affect the layout of buttons in notification toast
   <key>ImagePipelineHTTPMaxFailCountFallback</key>
     <map>
       <key>Comment</key>
-      <string>Maximum failures during HTTP GET texture fetch per region before fallback to UDP fetch occurs.</string>
+      <string>Maximum failures during HTTP GET texture fetch per region before fallback to UDP fetch occurs. Set to 0 to disable automatic fallback.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index a0e24a2ccd..46b24f0dcb 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -2856,7 +2856,8 @@ void LLTextureFetch::setMaxHttpFailCountBeforeFallback(U32 maxFailCount)
 
 bool LLTextureFetch::isHttpFailLimitReached()
 {
-	return mTotalHttpFailCount >= mMaxHttpFailCountBeforeFallback;
+	return (mMaxHttpFailCountBeforeFallback > 0) &&
+		(mTotalHttpFailCount >= mMaxHttpFailCountBeforeFallback);
 }
 
 //////////////////////////////////////////////////////////////////////////////