diff --git a/packages/core/admin/utils/get-custom-webpack-config.js b/packages/core/admin/utils/get-custom-webpack-config.js
index 8a1d59b432..258ebb231d 100644
--- a/packages/core/admin/utils/get-custom-webpack-config.js
+++ b/packages/core/admin/utils/get-custom-webpack-config.js
@@ -8,13 +8,18 @@ const fs = require('fs-extra');
 const getWebpackConfig = require('../webpack.config');
 
 const getCustomWebpackConfig = (dir, config) => {
-  const adminConfigPath = path.join(dir, 'src', 'admin', 'webpack.config.js');
+  const adminConfigPathJS = path.join(dir, 'src', 'admin', 'webpack.config.js');
+  const adminConfigPathTS = path.join(dir, 'src', 'admin', 'webpack.config.ts');
 
   let webpackConfig = getWebpackConfig(config);
 
-  if (fs.existsSync(adminConfigPath)) {
-    const webpackAdminConfig = require(path.resolve(adminConfigPath));
-
+  if (fs.existsSync(adminConfigPathJS) || fs.existsSync(adminConfigPathTS)) {
+    let webpackAdminConfig;
+    if (fs.existsSync(adminConfigPathJS)) {
+      webpackAdminConfig = require(path.resolve(adminConfigPathJS));
+    } else {
+      webpackAdminConfig = require(path.resolve(adminConfigPathTS));
+    }
     if (_.isFunction(webpackAdminConfig)) {
       // Expose the devServer configuration
       if (config.devServer) {
diff --git a/packages/generators/app/lib/resources/json/ts/tsconfig-server.json.js b/packages/generators/app/lib/resources/json/ts/tsconfig-server.json.js
index 0fd1c07e95..f93c39fa27 100644
--- a/packages/generators/app/lib/resources/json/ts/tsconfig-server.json.js
+++ b/packages/generators/app/lib/resources/json/ts/tsconfig-server.json.js
@@ -22,8 +22,6 @@ module.exports = () => ({
     '.cache/',
     '.tmp/',
 
-    // Do not include admin files in the server compilation
-    'src/admin/',
     // Do not include test files
     '**/*.test.ts',
     // Do not include plugins in the server compilation