diff --git a/Getting-Started/Configuration-Guide.md b/Getting-Started/Configuration-Guide.md
index b8d836477..0eaccf800 100644
--- a/Getting-Started/Configuration-Guide.md
+++ b/Getting-Started/Configuration-Guide.md
@@ -467,6 +467,8 @@ MaxScale normally suppresses warning messages about failed authentication. Enabl
 
 #### `connection_timeout`
 
+**NOTE**: This parameter is not safe to use in version 1.3.0. Please do not use it.
+
 The connection_timeout parameter is used to disconnect sessions to MaxScale that have been idle for too long. The session timeouts are disabled by default. To enable them, define the timeout in seconds in the service's configuration section.
 
 Example:
diff --git a/Release-Notes/MaxScale-1.3.0-Release-Notes.md b/Release-Notes/MaxScale-1.3.0-Release-Notes.md
index 9a8a45f05..a19e76638 100644
--- a/Release-Notes/MaxScale-1.3.0-Release-Notes.md
+++ b/Release-Notes/MaxScale-1.3.0-Release-Notes.md
@@ -236,6 +236,8 @@ details, please read the [Monitor Common](../Monitors/Monitor-Common.md) documen
 There are a number bugs and known limitations within this version of MaxScale,
 the most serious of this are listed below.
 
+* The `connection_timeout` service parameter is not safe to use in version 1.3.0.
+
 * MaxScale can not manage authentication that uses wildcard matching in hostnames in the mysql.user table of the backend database. The only wildcards that can be used are in IP address entries.
 
 * When users have different passwords based on the host from which they connect MaxScale is unable to determine which password it should use to connect to the backend database. This results in failed connections and unusable usernames in MaxScale.