diff --git a/packages/nextjs/src/config/webpackPluginOptions.ts b/packages/nextjs/src/config/webpackPluginOptions.ts
index 335c7bea8976..641efd77524c 100644
--- a/packages/nextjs/src/config/webpackPluginOptions.ts
+++ b/packages/nextjs/src/config/webpackPluginOptions.ts
@@ -41,11 +41,15 @@ export function getWebpackPluginOptions(
       );
     }
 
-    // TODO: We should think about uploading these when `widenClientFileUpload` is `true`. They may be useful in some situations.
+    // We want to include main-* files if widenClientFileUpload is true as they have proven to be useful
+    if (!sentryBuildOptions.widenClientFileUpload) {
+      sourcemapUploadIgnore.push(path.posix.join(distDirAbsPath, 'static', 'chunks', 'main-*'));
+    }
+
+    // Always ignore framework, polyfills, and webpack files
     sourcemapUploadIgnore.push(
       path.posix.join(distDirAbsPath, 'static', 'chunks', 'framework-*'),
       path.posix.join(distDirAbsPath, 'static', 'chunks', 'framework.*'),
-      path.posix.join(distDirAbsPath, 'static', 'chunks', 'main-*'),
       path.posix.join(distDirAbsPath, 'static', 'chunks', 'polyfills-*'),
       path.posix.join(distDirAbsPath, 'static', 'chunks', 'webpack-*'),
     );
diff --git a/packages/nextjs/test/config/webpack/webpackPluginOptions.test.ts b/packages/nextjs/test/config/webpack/webpackPluginOptions.test.ts
index 1dd0cfa95d5b..76ab58be9b64 100644
--- a/packages/nextjs/test/config/webpack/webpackPluginOptions.test.ts
+++ b/packages/nextjs/test/config/webpack/webpackPluginOptions.test.ts
@@ -153,9 +153,9 @@ describe('getWebpackPluginOptions()', () => {
     expect(generatedPluginOptions.sourcemaps).toMatchObject({
       assets: ['/my/project/dir/.next/static/chunks/pages/**', '/my/project/dir/.next/static/chunks/app/**'],
       ignore: [
+        '/my/project/dir/.next/static/chunks/main-*',
         '/my/project/dir/.next/static/chunks/framework-*',
         '/my/project/dir/.next/static/chunks/framework.*',
-        '/my/project/dir/.next/static/chunks/main-*',
         '/my/project/dir/.next/static/chunks/polyfills-*',
         '/my/project/dir/.next/static/chunks/webpack-*',
       ],
@@ -170,7 +170,6 @@ describe('getWebpackPluginOptions()', () => {
       ignore: [
         '/my/project/dir/.next/static/chunks/framework-*',
         '/my/project/dir/.next/static/chunks/framework.*',
-        '/my/project/dir/.next/static/chunks/main-*',
         '/my/project/dir/.next/static/chunks/polyfills-*',
         '/my/project/dir/.next/static/chunks/webpack-*',
       ],
@@ -197,7 +196,6 @@ describe('getWebpackPluginOptions()', () => {
       ignore: [
         'C:/my/windows/project/dir/.dist/v1/static/chunks/framework-*',
         'C:/my/windows/project/dir/.dist/v1/static/chunks/framework.*',
-        'C:/my/windows/project/dir/.dist/v1/static/chunks/main-*',
         'C:/my/windows/project/dir/.dist/v1/static/chunks/polyfills-*',
         'C:/my/windows/project/dir/.dist/v1/static/chunks/webpack-*',
       ],