diff --git a/packages/strapi-plugin-upload/services/Upload.js b/packages/strapi-plugin-upload/services/Upload.js
index 8b7f2d0c6c..c4bcb52faf 100644
--- a/packages/strapi-plugin-upload/services/Upload.js
+++ b/packages/strapi-plugin-upload/services/Upload.js
@@ -268,6 +268,12 @@ module.exports = {
   },
 
   count(params) {
+    // FIXME: until we support boolean operators for querying we need to make mime_ncontains use AND instead of OR
+    if (_.has(params, 'mime_ncontains') && Array.isArray(params.mime_ncontains)) {
+      params._where = params.mime_ncontains.map(val => ({ mime_ncontains: val }));
+      delete params.mime_ncontains;
+    }
+
     return strapi.query('file', 'upload').count(params);
   },