diff --git a/lib/coinatmradar/coinatmradar.js b/lib/coinatmradar/coinatmradar.js
index 64660f4e..5674e9b0 100644
--- a/lib/coinatmradar/coinatmradar.js
+++ b/lib/coinatmradar/coinatmradar.js
@@ -69,7 +69,7 @@ function mapMachine (rates, settings, machineRow) {
   const lastOnline = machineRow.last_online.toISOString()
   const status = machineRow.stale ? 'online' : 'offline'
   const showLimitsAndVerification = coinAtmRadar.limitsAndVerification
-  const cashLimit = showLimitsAndVerification ? ( complianceTriggers.getCashLimit(triggers)?.threshold || Infinity ) : null
+  const cashLimit = showLimitsAndVerification ? (_.get('threshold', complianceTriggers.getCashLimit(triggers)) || Infinity) : null
   const cryptoCurrencies = locale.cryptoCurrencies
   const identification = mapIdentification(config)
   const coins = _.map(_.partial(mapCoin, [rates, deviceId, settings]), cryptoCurrencies)
diff --git a/lib/middlewares/operatorId.js b/lib/middlewares/operatorId.js
index eeb7d6ac..d11d22f6 100644
--- a/lib/middlewares/operatorId.js
+++ b/lib/middlewares/operatorId.js
@@ -2,7 +2,7 @@ const { getOperatorId } = require('../operator')
 
 function findOperatorId (req, res, next) {
   return getOperatorId('middleware')
-    .then(({ operatorId }) => {
+    .then(operatorId => {
       res.locals.operatorId = operatorId
       return next()
     })
diff --git a/lib/new-admin/middlewares/session.js b/lib/new-admin/middlewares/session.js
index 338e4b11..0db3e087 100644
--- a/lib/new-admin/middlewares/session.js
+++ b/lib/new-admin/middlewares/session.js
@@ -9,7 +9,7 @@ const { getOperatorId } = require('../../operator')
 
 const hostname = options.hostname
 
-router.use('*', async (req, res, next) => getOperatorId('authentication').then(({ operatorId }) => session({
+router.use('*', async (req, res, next) => getOperatorId('authentication').then(operatorId => session({
   store: new PgSession({
     pgPromise: db,
     tableName: USER_SESSIONS_TABLE_NAME
diff --git a/lib/operator.js b/lib/operator.js
index 63cbb768..ccd9ad5e 100644
--- a/lib/operator.js
+++ b/lib/operator.js
@@ -4,7 +4,7 @@ const _ = require('lodash/fp')
 function getOperatorId (service) {
   const sql = `SELECT operator_id FROM operator_ids WHERE service = '${service}'`
   return db.oneOrNone(sql)
-    .then(_.mapKeys(_.camelCase))
+    .then(_.get('operator_id'))
 }
 
 module.exports = { getOperatorId }