diff --git a/packages/strapi/lib/core/bootstrap.js b/packages/strapi/lib/core/bootstrap.js
index ec135b75bf..4ab8930378 100644
--- a/packages/strapi/lib/core/bootstrap.js
+++ b/packages/strapi/lib/core/bootstrap.js
@@ -25,11 +25,6 @@ module.exports = function(strapi) {
   // Set current connections.
   strapi.config.connections = strapi.config.get('database.connections', {});
 
-  // FIXME:
-  if (_.get(strapi.config, 'language.enabled')) {
-    strapi.config.language.locales = Object.keys(_.get(strapi.config, 'locales', {}));
-  }
-
   strapi.contentTypes = {};
 
   // Set models.
diff --git a/packages/strapi/lib/middlewares/language/index.js b/packages/strapi/lib/middlewares/language/index.js
index 4c25ad23e0..3ceb20499e 100644
--- a/packages/strapi/lib/middlewares/language/index.js
+++ b/packages/strapi/lib/middlewares/language/index.js
@@ -6,7 +6,6 @@
 
 // Node.js core.
 const { resolve } = require('path');
-const { get } = require('lodash');
 const locale = require('koa-locale');
 const i18n = require('koa-i18n');
 /**
@@ -29,13 +28,19 @@ module.exports = strapi => {
       strapi.app.use(
         i18n(strapi.app, {
           directory,
-          locales: Object.keys(get(strapi.config, 'locales', {})),
+          locales: strapi.config.get('middleware.settings.language.locales', []),
           defaultLocale,
           modes,
           cookieName,
           extension: '.json',
         })
       );
+
+      strapi.app.use((ctx, next) => {
+        console.log(ctx.i18n.__('someKey'));
+
+        next();
+      });
     },
   };
 };