diff --git a/models/certificate.js b/models/certificate.js
index 0501dd0c..01189262 100644
--- a/models/certificate.js
+++ b/models/certificate.js
@@ -177,15 +177,10 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
         where: {name, claimId},
       })
       .then(result => {
-        switch (result.length) {
-          case 0:
-            return resolve(NO_CHANNEL);
-          case 1:
-            return resolve(result[0]);
-          default:
-            logger.warn(`more than one entry matches that name (${name}) and certificate Id (${claimId})`);
-            return resolve(result[0]);
-        }
+        if (!result) {
+          return resolve(NO_CHANNEL);
+        };
+        resolve(claimId);
       })
       .catch(error => {
         reject(error);
diff --git a/models/claim.js b/models/claim.js
index 48330bc8..4f45184b 100644
--- a/models/claim.js
+++ b/models/claim.js
@@ -310,9 +310,10 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
           where: { name, claimId },
         })
         .then(result => {
+          if (!result) {
+            return resolve(null);
+          };
           switch (result.length) {
-            case 0:
-              return resolve(null);
             case 1:
               return resolve(result[0]);
             default: