diff --git a/packages/strapi-plugin-upload/controllers/upload/admin.js b/packages/strapi-plugin-upload/controllers/upload/admin.js
index 80449ced33..d2a5e4a9a0 100644
--- a/packages/strapi-plugin-upload/controllers/upload/admin.js
+++ b/packages/strapi-plugin-upload/controllers/upload/admin.js
@@ -211,7 +211,5 @@ const findEntityAndCheckPermissions = async (ability, action, model, id) => {
     throw strapi.errors.forbidden();
   }
 
-  console.log(fileWithRoles);
-
   return { pm, file };
 };
diff --git a/packages/strapi-plugin-upload/middlewares/upload/index.js b/packages/strapi-plugin-upload/middlewares/upload/index.js
index 760f8e922c..8df4509977 100644
--- a/packages/strapi-plugin-upload/middlewares/upload/index.js
+++ b/packages/strapi-plugin-upload/middlewares/upload/index.js
@@ -1,15 +1,18 @@
 'use strict';
 
-const { join } = require('path');
+const { join, isAbsolute } = require('path');
 const range = require('koa-range');
 const koaStatic = require('koa-static');
 
 module.exports = strapi => ({
   initialize() {
-    const staticDir = join(
-      strapi.dir,
-      strapi.config.middleware.settings.public.path || strapi.config.paths.static
+    const configPublicPath = strapi.config.get(
+      'middleware.settings.public.path',
+      strapi.config.paths.static
     );
+    const staticDir = isAbsolute(configPublicPath)
+      ? configPublicPath
+      : join(strapi.dir, configPublicPath);
 
     strapi.app.on('error', err => {
       if (err.code === 'EPIPE') {
diff --git a/packages/strapi-provider-upload-local/lib/index.js b/packages/strapi-provider-upload-local/lib/index.js
index 8db55e98b4..317b8e2650 100644
--- a/packages/strapi-provider-upload-local/lib/index.js
+++ b/packages/strapi-provider-upload-local/lib/index.js
@@ -23,10 +23,13 @@ module.exports = {
         });
       }
     };
-    const uploadDir = path.join(
-      strapi.dir,
-      strapi.config.get('middleware.settings.public.path', strapi.config.paths.static)
+    const configPublicPath = strapi.config.get(
+      'middleware.settings.public.path',
+      strapi.config.paths.static
     );
+    const uploadDir = path.isAbsolute(configPublicPath)
+      ? configPublicPath
+      : path.join(strapi.dir, configPublicPath);
 
     return {
       upload(file) {