diff --git a/src/plugins/_core/noTrack.ts b/src/plugins/_core/noTrack.ts
index d282c8ae6..d030c6577 100644
--- a/src/plugins/_core/noTrack.ts
+++ b/src/plugins/_core/noTrack.ts
@@ -125,6 +125,7 @@ export default definePlugin({
 
             set() {
                 new Logger("NoTrack", "#8caaee").error("Failed to disable Sentry. Falling back to deleting window.DiscordSentry");
+
                 Reflect.deleteProperty(Function.prototype, "g");
                 Reflect.deleteProperty(window, "DiscordSentry");
             }
diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index 1881434f5..8ba7d33aa 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -48,7 +48,7 @@ define(Function.prototype, "m", {
         // We may also catch Discord bundled libs, React Devtools or other extensions WebpackInstance here.
         // This ensures we actually got the right ones
         const { stack } = new Error();
-        if (!(stack?.includes("discord.com") || stack?.includes("discordapp.com")) || Array.isArray(originalModules)) {
+        if (!(stack?.includes("discord.com") || stack?.includes("discordapp.com")) || (stack != null ? /at \d+? \(/.test(stack) : true) || !String(this).includes("exports:{}")) {
             return;
         }
 
@@ -66,7 +66,7 @@ define(Function.prototype, "m", {
                 define(this, "p", { value: bundlePath });
                 clearTimeout(setterTimeout);
 
-                if (bundlePath !== "/assets/") return;
+                if (window.GLOBAL_ENV?.PUBLIC_PATH != null && bundlePath !== window.GLOBAL_ENV.PUBLIC_PATH) return;
 
                 logger.info("Main Webpack found" + interpolateIfDefined` in ${fileName}` + ", initializing internal references to WebpackRequire");
                 _initWebpack(this);