diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index 311e6f2bc..da5ca8b96 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -209,7 +209,7 @@ function patchFactories(factories: Record<string, (module: any, exports: any, re
 
             // There are (at the time of writing) 11 modules exporting the window
             // Make these non enumerable to improve webpack search performance
-            if (exports === window && require.c) {
+            if (require.c && (exports === window || exports?.default === window)) {
                 Object.defineProperty(require.c, id, {
                     value: require.c[id],
                     enumerable: false,
@@ -229,7 +229,7 @@ function patchFactories(factories: Record<string, (module: any, exports: any, re
 
             for (const [filter, callback] of subscriptions) {
                 try {
-                    if (filter(exports)) {
+                    if (exports && filter(exports)) {
                         subscriptions.delete(filter);
                         callback(exports, id);
                     } else if (exports.default && filter(exports.default)) {
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 854820851..f2e6e58a8 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -106,13 +106,13 @@ export const find = traceFunction("find", function find(filter: FilterFn, { isIn
 
     for (const key in cache) {
         const mod = cache[key];
-        if (!mod?.exports || mod.exports === window) continue;
+        if (!mod?.exports) continue;
 
         if (filter(mod.exports)) {
             return isWaitFor ? [mod.exports, key] : mod.exports;
         }
 
-        if (mod.exports.default && mod.exports.default !== window && filter(mod.exports.default)) {
+        if (mod.exports.default && filter(mod.exports.default)) {
             const found = mod.exports.default;
             return isWaitFor ? [found, key] : found;
         }