diff --git a/packages/strapi-mongoose/lib/index.js b/packages/strapi-mongoose/lib/index.js
index 1d5d5b8a2e..1e87bec89d 100755
--- a/packages/strapi-mongoose/lib/index.js
+++ b/packages/strapi-mongoose/lib/index.js
@@ -106,7 +106,8 @@ module.exports = function (strapi) {
                             if (this._mongooseOptions.populate && this._mongooseOptions.populate[association.alias]) {
                               if (association.nature === 'oneToMorph' || association.nature === 'manyToMorph') {
                                 this._mongooseOptions.populate[association.alias].match = {
-                                  [`${association.via}.${association.where}`]: association.alias
+                                  [`${association.via}.${association.where}`]: association.alias,
+                                  [`${association.via}.kind`]: definition.globalId
                                 }
                               } else {
                                 this._mongooseOptions.populate[association.alias].path = `${association.alias}.${association.key}`;
diff --git a/packages/strapi-plugin-users-permissions/models/User.settings.json b/packages/strapi-plugin-users-permissions/models/User.settings.json
index 0ee4fa34f1..e64b741cbb 100644
--- a/packages/strapi-plugin-users-permissions/models/User.settings.json
+++ b/packages/strapi-plugin-users-permissions/models/User.settings.json
@@ -36,10 +36,6 @@
       "via": "users",
       "plugin": "users-permissions",
       "configurable": false
-    },
-    "avatar": {
-      "model": "upload",
-      "via": "related"
     }
   }
 }