diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
index dc94d71be..e9f719db4 100644
--- a/CHANGES_NEXT_RELEASE
+++ b/CHANGES_NEXT_RELEASE
@@ -1 +1,2 @@
-- Upgrade express de from 4.19.2 to 4.20.0
+- Fix: autoprovison now working with resources diferent from defaultResource (#1524)
+
diff --git a/lib/services/groups/groupRegistryMongoDB.js b/lib/services/groups/groupRegistryMongoDB.js
index 740a3fad7..44ff3107b 100644
--- a/lib/services/groups/groupRegistryMongoDB.js
+++ b/lib/services/groups/groupRegistryMongoDB.js
@@ -216,7 +216,9 @@ function find(service, subservice, callback) {
 }
 
 function findOneInMongoDB(queryObj, fields, callback) {
-    const query = Group.model.findOne(queryObj);
+    const query = Group.model.findOne({
+        $or: [{ apikey: queryObj.apikey }, { type: queryObj.type }]
+    });
     query.select({ __v: 0 });
     query.lean().exec(function handleGet(error, data) {
         if (error) {
@@ -224,6 +226,7 @@ function findOneInMongoDB(queryObj, fields, callback) {
             callback(new errors.InternalDbError(error));
         } else if (data) {
             context = fillService(context, data);
+            queryObj.resource = data.resource;
             logger.debug(context, 'Device group data found: %j', data);
             callback(null, data);
         } else {