diff --git a/modules/distribution/src/repository/resources/conf/default.json b/modules/distribution/src/repository/resources/conf/default.json
index d2b3b48ecae..c56ba1b9d6e 100644
--- a/modules/distribution/src/repository/resources/conf/default.json
+++ b/modules/distribution/src/repository/resources/conf/default.json
@@ -27,6 +27,7 @@
   "http_access_log.pattern": "%h %l %u %t %r %s %b "%{Referer}i" "%{User-Agent}i" %T",
 
   "log_correlation.header_config": "{'activityid':'Correlation-ID'}",
+  "log_correlation.query_config": "{'RelayState':'Correlation-ID'}",
 
   "monitoring.jmx.rmi_server_start": false,
   "product.version" : "${product.version}",
diff --git a/modules/distribution/src/repository/resources/conf/templates/repository/conf/tomcat/catalina-server.xml.j2 b/modules/distribution/src/repository/resources/conf/templates/repository/conf/tomcat/catalina-server.xml.j2
index 499861243b9..452bc6c8c78 100644
--- a/modules/distribution/src/repository/resources/conf/templates/repository/conf/tomcat/catalina-server.xml.j2
+++ b/modules/distribution/src/repository/resources/conf/templates/repository/conf/tomcat/catalina-server.xml.j2
@@ -92,7 +92,7 @@
                 {% endif %}
                 <Valve className="org.wso2.carbon.tomcat.ext.valves.RequestCorrelationIdValve"
                        headerToCorrelationIdMapping="{{log_correlation.header_config}}"
-                       queryToCorrelationIdMapping="{'RelayState':'Correlation-ID'}"
+                       queryToCorrelationIdMapping="{{log_correlation.query_config}}"
                        {% if correlation.response.header is defined %}
                             responseCorrelationIdHeader= "{{correlation.response.header}}"
                        {% endif %}