diff --git a/lib/apiserver/handler/on-received.js b/lib/apiserver/handler/on-received.js
index 44f6d93..04cae0d 100644
--- a/lib/apiserver/handler/on-received.js
+++ b/lib/apiserver/handler/on-received.js
@@ -1,3 +1,5 @@
+const DEFAULT_MAX_MESSAGE_AGE_IN_SECS = 300;
+
 const moment = require('moment');
 const config = require('komodo-sdk/config');
 const logger = require('komodo-sdk/logger');
@@ -14,13 +16,15 @@ module.exports = (req, res) => {
 
     const sentTime = moment(ts, 'YYYY-MM-DD HH:mm:ss');
     const messageAgeInSeconds = Math.round(Number(new Date() - sentTime) / 1000);
-    const maxAgeInSeconds = 300;
 
-    if (messageAgeInSeconds > maxAgeInSeconds) {
+    const maxMessageAgeInSeconds = config.max_message_age_in_secs
+        || DEFAULT_MAX_MESSAGE_AGE_IN_SECS;
+
+    if (messageAgeInSeconds > maxMessageAgeInSeconds) {
         logger.warn('ON-RECEIVED: Got expired message from EVO-CP', {
             qs: req.query,
             messageAgeInSeconds,
-            maxAgeInSeconds,
+            maxMessageAgeInSeconds,
         });
 
         return;