diff --git a/packages/core/upload/server/bootstrap.js b/packages/core/upload/server/bootstrap.js
index c45e6d5df6..af3e2dff3d 100644
--- a/packages/core/upload/server/bootstrap.js
+++ b/packages/core/upload/server/bootstrap.js
@@ -39,6 +39,12 @@ module.exports = async ({ strapi }) => {
 
   await getService('weeklyMetrics').registerCron();
   getService('metrics').sendUploadPluginMetrics();
+
+  if (strapi.config.get('plugin.upload.onlySignUrlsAdmin', false)) {
+    getService('extensions').contentManager.entityManager.addSignedFileUrlsToAdmin();
+  } else {
+    getService('extensions').core.entityService.addSignedFileUrlsToEntityService();
+  }
 };
 
 const registerPermissionActions = async () => {
diff --git a/packages/core/upload/server/register.js b/packages/core/upload/server/register.js
index 8ecc75301a..4a7143a670 100644
--- a/packages/core/upload/server/register.js
+++ b/packages/core/upload/server/register.js
@@ -6,7 +6,6 @@ const {
 } = require('@strapi/utils');
 const _ = require('lodash');
 const registerUploadMiddleware = require('./middlewares/upload');
-const { getService } = require('./utils');
 
 /**
  * Register upload plugin
@@ -17,8 +16,6 @@ module.exports = async ({ strapi }) => {
 
   await registerUploadMiddleware({ strapi });
 
-  getService('extensions').contentManager.entityManager.addSignedFileUrlsToAdmin();
-
   if (strapi.plugin('graphql')) {
     require('./graphql')({ strapi });
   }