diff --git a/server/core/config.cc b/server/core/config.cc
index adbf12f1a..c4e4d0385 100644
--- a/server/core/config.cc
+++ b/server/core/config.cc
@@ -313,7 +313,7 @@ const MXS_MODULE_PARAM config_service_params[] =
     {CN_LOG_AUTH_WARNINGS,             MXS_MODULE_PARAM_BOOL,   "true"},
     {CN_RETRY_ON_FAILURE,              MXS_MODULE_PARAM_BOOL,   "true"},
     {CN_SESSION_TRACK_TRX_STATE,       MXS_MODULE_PARAM_BOOL,   "false"},
-    {CN_RETAIN_LAST_STATEMENTS,        MXS_MODULE_PARAM_COUNT,  "0"},
+    {CN_RETAIN_LAST_STATEMENTS,        MXS_MODULE_PARAM_INT,    "-1"},
     {NULL}
 };
 
diff --git a/server/core/service.cc b/server/core/service.cc
index e73dbd5b9..b7ba9947f 100644
--- a/server/core/service.cc
+++ b/server/core/service.cc
@@ -199,15 +199,7 @@ Service::Service(const std::string& service_name,
     log_auth_warnings = config_get_bool(params, CN_LOG_AUTH_WARNINGS);
     strip_db_esc = config_get_bool(params, CN_STRIP_DB_ESC);
     session_track_trx_state = config_get_bool(params, CN_SESSION_TRACK_TRX_STATE);
-
-    if (config_get_param(params, CN_RETAIN_LAST_STATEMENTS))
-    {
-        retain_last_statements = config_get_integer(params, CN_RETAIN_LAST_STATEMENTS);
-    }
-    else
-    {
-        retain_last_statements = -1; // Indicates that it has not been set.
-    }
+    retain_last_statements = config_get_integer(params, CN_RETAIN_LAST_STATEMENTS);
 
     /**
      * At service start last update is set to config->users_refresh_time seconds earlier.