diff --git a/src/__tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack5/server--main.js b/src/__tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack5/server--main.js
index 3b85ea2..d70f061 100644
--- a/src/__tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack5/server--main.js
+++ b/src/__tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack5/server--main.js
@@ -1 +1 @@
-(()=>{var e={845:(e,t,r)=>{"use strict";r.r(t),r.d(t,{default:()=>m});const s=require("marko/dist/runtime/html"),o=require("marko/dist/runtime/components/renderer");var n=r.n(o);const i=(0,s.t)(),a=i;i._=n()((function(e,t,r,s,o){t.w("<h1>Hello World</h1>")}),{t:"7Fk+kAfP",i:!0},{});const l={getAssets(e){return this.build[e]},build:{"test_7Fk-":{js:["test_7Fk-.js"]}}},c=require("marko/dist/core-tags/core/__flush_here_and_after__.js");var _=r.n(c);const d=require("marko/dist/runtime/helpers/render-tag");var u=r.n(d);const f=require("marko/dist/core-tags/components/init-components-tag.js");var p=r.n(f);const g=require("marko/dist/core-tags/core/await/reorderer-renderer.js");var b=r.n(g);const h=(0,s.t)(),m=h;function y(){const e=this.global.___entries;if(this.global.___entries=void 0,e){r.p&&this.script(`$mwp=${JSON.stringify(r.p)}`);const t=this.global.buildName,s=this.global.cspNonce,o=s?` nonce=${JSON.stringify(s)}`:"",n=this.global.___writtenAssets||(this.global.___writtenAssets=new Set);let i="",a="";for(const s of e){const e=l.getAssets(s,t);if(e.js)for(const t of e.js)n.has(t)||(n.add(t),i+=`<script src=${JSON.stringify(r.p+t)}${o} async><\/script>`);if(e.css)for(const t of e.css)n.has(t)||(n.add(t),a+=`<link rel="stylesheet" href=${JSON.stringify(r.p+t)}>`)}this.write(i+a)}}h._=n()((function(e,t,r,s,o){t.global.___renderAssets=y,t.global.___entries=(t.global.___entries||[]).push("test_7Fk-"),u()(_(),{renderBody:e=>{e.global.___renderAssets&&e.global.___renderAssets()}},t,r,"0"),u()(a,e,t,r,"1"),u()(p(),{},t,r,"2"),u()(b(),{},t,r,"3")}),{t:"7Fk+kAfP",i:!0},{})},605:e=>{"use strict";e.exports=require("http")}},t={};function r(s){var o=t[s];if(void 0!==o)return o.exports;var n=t[s]={exports:{}};return e[s](n,n.exports,r),n.exports}r.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return r.d(t,{a:t}),t},r.d=(e,t)=>{for(var s in t)r.o(t,s)&&!r.o(e,s)&&Object.defineProperty(e,s,{enumerable:!0,get:t[s]})},r.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),r.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.p="",(()=>{const e=r(605),t=r(845);e.createServer(((e,r)=>{t.render({},r)})).listen(0)})()})();
\ No newline at end of file
+(()=>{var e={845:(e,t,r)=>{"use strict";r.r(t),r.d(t,{default:()=>m});const s=require("marko/dist/runtime/html"),o=require("marko/dist/runtime/components/renderer");var n=r.n(o);const i=(0,s.t)(),a=i;i._=n()((function(e,t,r,s,o){t.w("<h1>Hello World</h1>")}),{t:"7Fk+kAfP",i:!0},{});const l={getAssets(e){return this.build[e]},build:{"test_7Fk-":{}}},c=require("marko/dist/core-tags/core/__flush_here_and_after__.js");var _=r.n(c);const d=require("marko/dist/runtime/helpers/render-tag");var u=r.n(d);const f=require("marko/dist/core-tags/components/init-components-tag.js");var p=r.n(f);const g=require("marko/dist/core-tags/core/await/reorderer-renderer.js");var b=r.n(g);const h=(0,s.t)(),m=h;function y(){const e=this.global.___entries;if(this.global.___entries=void 0,e){r.p&&this.script(`$mwp=${JSON.stringify(r.p)}`);const t=this.global.buildName,s=this.global.cspNonce,o=s?` nonce=${JSON.stringify(s)}`:"",n=this.global.___writtenAssets||(this.global.___writtenAssets=new Set);let i="",a="";for(const s of e){const e=l.getAssets(s,t);if(e.js)for(const t of e.js)n.has(t)||(n.add(t),i+=`<script src=${JSON.stringify(r.p+t)}${o} async><\/script>`);if(e.css)for(const t of e.css)n.has(t)||(n.add(t),a+=`<link rel="stylesheet" href=${JSON.stringify(r.p+t)}>`)}this.write(i+a)}}h._=n()((function(e,t,r,s,o){t.global.___renderAssets=y,t.global.___entries=(t.global.___entries||[]).push("test_7Fk-"),u()(_(),{renderBody:e=>{e.global.___renderAssets&&e.global.___renderAssets()}},t,r,"0"),u()(a,e,t,r,"1"),u()(p(),{},t,r,"2"),u()(b(),{},t,r,"3")}),{t:"7Fk+kAfP",i:!0},{})},605:e=>{"use strict";e.exports=require("http")}},t={};function r(s){var o=t[s];if(void 0!==o)return o.exports;var n=t[s]={exports:{}};return e[s](n,n.exports,r),n.exports}r.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return r.d(t,{a:t}),t},r.d=(e,t)=>{for(var s in t)r.o(t,s)&&!r.o(e,s)&&Object.defineProperty(e,s,{enumerable:!0,get:t[s]})},r.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),r.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.p="",(()=>{const e=r(605),t=r(845);e.createServer(((e,r)=>{t.render({},r)})).listen(0)})()})();
\ No newline at end of file
diff --git a/src/plugin/index.ts b/src/plugin/index.ts
index b3dd353..4258276 100644
--- a/src/plugin/index.ts
+++ b/src/plugin/index.ts
@@ -253,58 +253,49 @@ export default class MarkoWebpackPlugin {
             pendingAssets.finally(() => prevPendingAssets.resolve());
           }
 
-          (WEBPACK_5
-            ? (compilation as any).hooks.afterProcessAssets
-            : compilation.hooks.afterOptimizeAssets
-          ).tap("MarkoWebpackBrowser:afterProcessAssets", () => {
-            if (pendingAssets !== compiler.markoAssetsPending) {
-              return;
-            }
-
-            for (const [entryName, { chunks }] of compilation.entrypoints) {
-              const assetsByType: { [x: string]: string[] } = {};
+          compilation.hooks.afterOptimizeAssets.tap(
+            "MarkoWebpackBrowser:afterProcessAssets",
+            () => {
+              if (pendingAssets !== compiler.markoAssetsPending) {
+                return;
+              }
 
-              for (const { files } of chunks) {
-                if (files) {
-                  for (const asset of files) {
-                    const ext = path.extname(asset).slice(1);
-                    const type = (assetsByType[ext] = assetsByType[ext] || []);
-                    type.push(asset);
+              for (const [entryName, { chunks }] of compilation.entrypoints) {
+                const assetsByType: { [x: string]: string[] } = {};
+
+                for (const { files } of chunks) {
+                  if (files) {
+                    for (const asset of files) {
+                      if (compilation.assets[asset].size() === 0) {
+                        if (WEBPACK_5) {
+                          (compilation as any).deleteAsset(asset);
+                        } else {
+                          delete compilation.assets[asset];
+                        }
+
+                        continue;
+                      }
+                      const ext = path.extname(asset).slice(1);
+                      const type = (assetsByType[ext] =
+                        assetsByType[ext] || []);
+                      type.push(asset);
+                    }
                   }
                 }
-              }
-
-              const buildAssets = (this.clientAssets[compilerName] =
-                this.clientAssets[compilerName] || {});
-              buildAssets[entryName] = assetsByType;
-            }
-
-            if (this.serverCompiler.markoAssetsRead) {
-              this.serverCompiler.watching?.invalidate();
-            }
 
-            compiler.markoAssetsPending = undefined;
-            pendingAssets.resolve();
-          });
-        }
-      );
+                const buildAssets = (this.clientAssets[compilerName] =
+                  this.clientAssets[compilerName] || {});
+                buildAssets[entryName] = assetsByType;
+              }
 
-      compiler.hooks.afterCompile.tap(
-        "MarkWebpackBrowser:afterCompile",
-        compilation => {
-          for (const chunk of compilation.chunks) {
-            for (const assetName of chunk.files) {
-              const asset = compilation.assets[assetName];
-              if (asset.size() === 0) {
-                delete compilation.assets[assetName];
-                if (Array.isArray(chunk.files)) {
-                  chunk.files.splice(chunk.files.indexOf(assetName), 1);
-                } else {
-                  chunk.files.delete(assetName);
-                }
+              if (this.serverCompiler.markoAssetsRead) {
+                this.serverCompiler.watching?.invalidate();
               }
+
+              compiler.markoAssetsPending = undefined;
+              pendingAssets.resolve();
             }
-          }
+          );
         }
       );
     };