diff --git a/README.md b/README.md
index df3f0cdbe0d..abe25e6b0b9 100644
--- a/README.md
+++ b/README.md
@@ -108,6 +108,7 @@ supportedSubmitMethods | An array of of the HTTP operations that will have the '
 oauth2RedirectUrl | OAuth redirect URL
 showRequestHeaders | Whether or not to show the headers that were sent when making a request via the 'Try it out!' option. Defaults to `false`.
 jsonEditor | Enables a graphical view for editing complex bodies.  Defaults to `false`.
+disableAllOfResolving | Disables the resolving of `allOf` tags, which can be very slow. If you don't use `allOf` in your spec, this can speed up the initial loading of Swagger UI significantly while not affecting functionality.  Defaults to `false`.
 
 * All other parameters are explained in greater detail below
 
diff --git a/src/main/html/index.html b/src/main/html/index.html
index 787762c6b6e..1610ce04bca 100644
--- a/src/main/html/index.html
+++ b/src/main/html/index.html
@@ -72,7 +72,8 @@
         jsonEditor: false,
         apisSorter: "alpha",
         defaultModelRendering: 'schema',
-        showRequestHeaders: false
+        showRequestHeaders: false,
+        disableAllOfResolving: false
       });
 
       function addApiKeyAuthorization(){