diff --git a/lib/routes.js b/lib/routes.js
index 71fc86e3..2538ef76 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -70,6 +70,7 @@ function poll (req, res, next) {
   const operatorInfo = configManager.getOperatorInfo(settings.config)
   const cashOutConfig = configManager.getCashOut(deviceId, settings.config)
   const receipt = configManager.getReceipt(settings.config)
+  const terms = configManager.getTermsConditions(settings.config)
 
   pids[deviceId] = { pid, ts: Date.now() }
 
@@ -127,9 +128,8 @@ function poll (req, res, next) {
       // BACKWARDS_COMPATIBILITY 7.4.9
       // machines before 7.4.9 expect t&c on poll
       if (!machineVersion || semver.lt(machineVersion, '7.4.9')) {
-        response.terms = config.termsScreenActive && config.termsScreenText ? createTerms(config) : null
+        response.terms = createTerms(terms)
       }
-
       return res.json(_.assign(response, results))
     })
     .catch(next)