diff --git a/packages/core/strapi/lib/middlewares/public/index.js b/packages/core/strapi/lib/middlewares/public/index.js
index 3d5890e978..b036278917 100644
--- a/packages/core/strapi/lib/middlewares/public/index.js
+++ b/packages/core/strapi/lib/middlewares/public/index.js
@@ -81,7 +81,7 @@ module.exports = (config, { strapi }) => {
       {
         method: 'GET',
         path: '/(.*)',
-        handler: koaStatic(strapi.dirs.app.public, {
+        handler: koaStatic(strapi.dirs.static.public, {
           maxage: maxAge,
           defer: true,
         }),
diff --git a/packages/core/upload/server/middlewares/upload.js b/packages/core/upload/server/middlewares/upload.js
index 0568152c07..e00442a7a4 100644
--- a/packages/core/upload/server/middlewares/upload.js
+++ b/packages/core/upload/server/middlewares/upload.js
@@ -25,7 +25,7 @@ module.exports = ({ strapi }) => {
     {
       method: 'GET',
       path: '/uploads/(.*)',
-      handler: [range, koaStatic(strapi.dirs.app.public, { defer: true, ...localServerConfig })],
+      handler: [range, koaStatic(strapi.dirs.static.public, { defer: true, ...localServerConfig })],
       config: { auth: false },
     },
   ]);