diff --git a/lib/routes/pollingRoutes.js b/lib/routes/pollingRoutes.js
index b57db854..b4089d54 100644
--- a/lib/routes/pollingRoutes.js
+++ b/lib/routes/pollingRoutes.js
@@ -41,8 +41,8 @@ const createTerms = terms => (terms.active && terms.text) ? ({
 const buildTriggers = (allTriggers) => {
   const normalTriggers = []
   const customTriggers = _.filter(o => {
-    if (o.customInfoRequestId === '' || _.isNil(o.customInfoRequestId)) normalTriggers.push(o)
-    return !_.isNil(o.customInfoRequestId)
+    if (_.isEmpty(o.customInfoRequestId) || _.isNil(o.customInfoRequestId)) normalTriggers.push(o)
+    return !_.isNil(o.customInfoRequestId) && !_.isEmpty(o.customInfoRequestId)
   }, allTriggers)
 
   return _.flow([_.map(_.get('customInfoRequestId')), customRequestQueries.batchGetCustomInfoRequest])(customTriggers)
diff --git a/new-lamassu-admin/src/pages/Triggers/Wizard.js b/new-lamassu-admin/src/pages/Triggers/Wizard.js
index 050f272e..b78fc5fa 100644
--- a/new-lamassu-admin/src/pages/Triggers/Wizard.js
+++ b/new-lamassu-admin/src/pages/Triggers/Wizard.js
@@ -232,12 +232,12 @@ const Wizard = ({ onClose, save, error, currency, customInfoRequests }) => {
     const isSuspend = values?.requirement?.requirement === 'suspend'
     const isCustom = values?.requirement?.requirement === 'custom'
 
-    const hasRequirementError = requirements.hasRequirementError(
+    const hasRequirementError = requirements().hasRequirementError(
       errors,
       touched,
       values
     )
-    const hasCustomRequirementError = requirements.hasCustomRequirementError(
+    const hasCustomRequirementError = requirements().hasCustomRequirementError(
       errors,
       touched,
       values