diff --git a/lib/app.js b/lib/app.js
index 293f5b74..1e9e2d11 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -45,9 +45,9 @@ function loadSanctions (settings) {
   return Promise.resolve()
     .then(() => {
       const triggers = configManager.getTriggers(settings.config)
-      const compatTriggers = complianceTriggers.getBackwardsCompatibleTriggers(triggers)
+      const hasSanctions = complianceTriggers.hasSanctions(triggers)
 
-      if (!compatTriggers.sanctions) return
+      if (!hasSanctions) return
 
       logger.info('Loading sanctions DB...')
       return ofacUpdate.update()
diff --git a/lib/compliance-triggers.js b/lib/compliance-triggers.js
index 0b8815bb..d6fc088d 100644
--- a/lib/compliance-triggers.js
+++ b/lib/compliance-triggers.js
@@ -6,4 +6,8 @@ function getBackwardsCompatibleTriggers (triggers) {
   return _.mapValues(_.compose(_.get('threshold'), _.minBy('threshold')))(grouped)
 }
 
-module.exports = { getBackwardsCompatibleTriggers}
\ No newline at end of file
+function hasSanctions (triggers) {
+  return _.some(_.matches({ requirement: 'sanctions' }))(triggers)
+}
+
+module.exports = { getBackwardsCompatibleTriggers, hasSanctions }
\ No newline at end of file
diff --git a/lib/poller.js b/lib/poller.js
index bbd3f708..a648b4cc 100644
--- a/lib/poller.js
+++ b/lib/poller.js
@@ -50,9 +50,9 @@ function initialSanctionsDownload () {
 
 function updateAndLoadSanctions () {
   const triggers = configManager.getTriggers(settings().config)
-  const compatTriggers = complianceTriggers.getBackwardsCompatibleTriggers(triggers)
+  const hasSanctions = complianceTriggers.hasSanctions(triggers)
 
-  if (!compatTriggers.sanctions) return Promise.resolve()
+  if (!hasSanctions) return Promise.resolve()
 
   logger.info('Updating sanctions database...')
   return sanctionsUpdater.update()
diff --git a/lib/routes.js b/lib/routes.js
index bc54be22..6b033900 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -278,7 +278,7 @@ function updateCustomer (req, res, next) {
       // machines before 7.5 expect customer with sanctions result
       const isOlderMachineVersion = !machineVersion || semver.lt(machineVersion, '7.5.0-beta.0')
 
-      Promise.resolve({})
+      return Promise.resolve({})
         .then(emptyObj => {
           if (!isOlderMachineVersion) return Promise.resolve(emptyObj)
           return compliance.validationPatch(req.deviceId, !!compatTriggers.sanctions, mergedCustomer)
@@ -287,7 +287,6 @@ function updateCustomer (req, res, next) {
         .then(newPatch => customers.updatePhotoCard(id, newPatch))
         .then(newPatch => customers.updateFrontCamera(id, newPatch))
         .then(newPatch => customers.update(id, newPatch, null, txId))
-
     })
     .then(customer => respond(req, res, { customer }))
     .catch(next)
diff --git a/new-lamassu-admin/src/components/inputs/base/Autocomplete.js b/new-lamassu-admin/src/components/inputs/base/Autocomplete.js
index 38baeba5..499ac03d 100644
--- a/new-lamassu-admin/src/components/inputs/base/Autocomplete.js
+++ b/new-lamassu-admin/src/components/inputs/base/Autocomplete.js
@@ -89,7 +89,6 @@ const Autocomplete = ({
             size={size}
             fullWidth={fullWidth}
             textAlign={textAlign}
-            autoFocus={autoFocus}
           />
         )
       }}