diff --git a/packages/strapi-admin/services/permission/engine.js b/packages/strapi-admin/services/permission/engine.js
index 68ba36eb5e..92a630b010 100644
--- a/packages/strapi-admin/services/permission/engine.js
+++ b/packages/strapi-admin/services/permission/engine.js
@@ -96,7 +96,7 @@ module.exports = conditionProvider => ({
     // Transform each result into registerFn options
     const transformToRegisterOptions = map(result => ({
       action,
-      subject,
+      subject: subject || 'all',
       fields,
       condition: result,
     }));
diff --git a/packages/strapi-admin/services/role.js b/packages/strapi-admin/services/role.js
index c25699a09a..a5ad37ec82 100644
--- a/packages/strapi-admin/services/role.js
+++ b/packages/strapi-admin/services/role.js
@@ -219,12 +219,8 @@ const createRolesIfNoneExist = async ({ createPermissionsForAdmin = false } = {}
 
   // add plugin permissions for each role
   const defaultPluginPermissions = [
-    { action: 'plugins::upload.assets.create', subject: 'plugins::upload.file' },
-    {
-      action: 'plugins::upload.assets.update',
-      subject: 'plugins::upload.file',
-      conditions: ['admin::is-creator'],
-    },
+    { action: 'plugins::upload.assets.create' },
+    { action: 'plugins::upload.assets.update', conditions: ['admin::is-creator'] },
     { action: 'plugins::upload.assets.download' },
     { action: 'plugins::upload.assets.copy-link' },
   ].map(createPermission);
diff --git a/packages/strapi-plugin-upload/admin/src/permissions.js b/packages/strapi-plugin-upload/admin/src/permissions.js
index 2d923fd513..17ac88f6c3 100644
--- a/packages/strapi-plugin-upload/admin/src/permissions.js
+++ b/packages/strapi-plugin-upload/admin/src/permissions.js
@@ -7,11 +7,11 @@ const pluginPermissions = {
     { action: 'plugins::upload.read', subject: null },
     {
       action: 'plugins::upload.assets.create',
-      subject: 'plugins::upload.file',
+      subject: null,
     },
     {
       action: 'plugins::upload.assets.update',
-      subject: 'plugins::upload.file',
+      subject: null,
     },
   ],
   copyLink: [
@@ -23,7 +23,7 @@ const pluginPermissions = {
   create: [
     {
       action: 'plugins::upload.assets.create',
-      subject: 'plugins::upload.file',
+      subject: null,
     },
   ],
   download: [
@@ -34,9 +34,7 @@ const pluginPermissions = {
   ],
   read: [{ action: 'plugins::upload.read', subject: null }],
   settings: [{ action: 'plugins::upload.settings.read', subject: null }],
-  update: [
-    { action: 'plugins::upload.assets.update', subject: 'plugins::upload.file', fields: null },
-  ],
+  update: [{ action: 'plugins::upload.assets.update', subject: null, fields: null }],
 };
 
 export default pluginPermissions;