diff --git a/content/en/docs/refguide/runtime/custom-settings/_index.md b/content/en/docs/refguide/runtime/custom-settings/_index.md
index 1e724084793..389e81af2f0 100644
--- a/content/en/docs/refguide/runtime/custom-settings/_index.md
+++ b/content/en/docs/refguide/runtime/custom-settings/_index.md
@@ -322,6 +322,7 @@ These settings can be set either as JVM properties or as custom Runtime settings
| http.proxyPort | Defines the port number of the HTTP proxy server. | |
| http.proxyUser | Defines the user of the HTTP proxy server. | |
| http.proxyPassword | Defines the password of the HTTP proxy server. | |
+| http.nonProxyHosts | See below | |
{{% alert color="info" %}}
The `http.` part of the names of these settings does not imply anything about whether the `HTTP` or `HTTPS` protocol is used - it is just the name of the setting.
@@ -341,8 +342,22 @@ These settings have to be set as JVM properties, not as custom runtime settings.
| https.proxyPort | Defines the port number of the HTTPS proxy server. | |
| https.proxyUser | Defines the user of the HTTPS proxy server. | |
| https.proxyPassword | Defines the password of the HTTPS proxy server. | |
-| https.nonProxyHosts | Defines a list of hosts that should be reached directly, bypassing the proxy. This is a list of patterns separated by '|'. The patterns may start or end with a '*' for wildcards. | |
+| http.nonProxyHosts | See below | |
{{% alert color="info" %}}
The `https.` part of the names of these settings does not imply anything about whether the `HTTP` or `HTTPS` protocol is used - it is just the name of the setting.
{{% /alert %}}
+
+### Non-proxy hosts {#non-proxy-hosts}
+
+{{% alert color="info" %}}
+Using `http.nonProxyHosts` for http(s) connections was introduced in Mendix 11.10.0.
+{{% /alert %}}
+
+The `http.nonProxyHosts` setting defines a list of hosts that should be reached directly, bypassing the proxy. This is a list of patterns separated by '|'.
+
+This setting applies to both http(s) connections and the license server:
+
+* Http(s) connections – the patterns may start or end with a '*' for wildcards
+* License server – the runtime ignores wildcards
+
diff --git a/content/en/docs/refguide10/runtime/custom-settings/_index.md b/content/en/docs/refguide10/runtime/custom-settings/_index.md
index b276b1e9e0b..2357dcacced 100644
--- a/content/en/docs/refguide10/runtime/custom-settings/_index.md
+++ b/content/en/docs/refguide10/runtime/custom-settings/_index.md
@@ -334,7 +334,7 @@ These settings have to be set as JVM properties, not as custom runtime settings.
| https.proxyPort | Defines the port number of the HTTPS proxy server. | |
| https.proxyUser | Defines the user of the HTTPS proxy server. | |
| https.proxyPassword | Defines the password of the HTTPS proxy server. | |
-| https.nonProxyHosts | Defines a list of hosts that should be reached directly, bypassing the proxy. This is a list of patterns separated by '|'. The patterns may start or end with a '*' for wildcards. | |
+| http.nonProxyHosts | Defines a list of hosts that should be reached directly, bypassing the proxy. This is a list of host names separated by '|'. | |
{{% alert color="info" %}}
The `https.` part of the names of these settings does not imply anything about whether the `HTTP` or `HTTPS` protocol is used - it is just the name of the setting.
diff --git a/content/en/docs/refguide9/runtime/custom-settings/_index.md b/content/en/docs/refguide9/runtime/custom-settings/_index.md
index 424884847c2..20ab214b8cf 100644
--- a/content/en/docs/refguide9/runtime/custom-settings/_index.md
+++ b/content/en/docs/refguide9/runtime/custom-settings/_index.md
@@ -284,7 +284,7 @@ These settings have to be set as JVM properties, not as custom runtime settings.
| https.proxyPort | Defines the port number of the HTTPS proxy server. | |
| https.proxyUser | Defines the user of the HTTPS proxy server. | |
| https.proxyPassword | Defines the password of the HTTPS proxy server. | |
-| https.nonProxyHosts | Defines a list of hosts that should be reached directly, bypassing the proxy. This is a list of patterns separated by '|'. The patterns may start or end with a '*' for wildcards. | |
+| http.nonProxyHosts | Defines a list of hosts that should be reached directly, bypassing the proxy. This is a list of host names separated by '|'. | |
{{% alert color="info" %}}
The `https.` part of the names of these settings does not imply anything about whether the `HTTP` or `HTTPS` protocol is used - it is just the name of the setting.