diff --git a/packages/html-reporter/bundle.js b/packages/html-reporter/bundle.js
index 478e48357f..98b59c8f30 100644
--- a/packages/html-reporter/bundle.js
+++ b/packages/html-reporter/bundle.js
@@ -31,6 +31,7 @@ export function bundle() {
       transform(html, ctx) {
         if (!ctx || !ctx.bundle)
           return html;
+        html = html.replace(/(?=<!--)([\s\S]*?)-->/, '');
         for (const [, value] of Object.entries(ctx.bundle)) {
           if (value.code)
             html = html.replace(/<script type="module".*<\/script>/, () => `<script type="module">${value.code}</script>`);
diff --git a/packages/trace-viewer/bundle.js b/packages/trace-viewer/bundle.js
new file mode 100644
index 0000000000..6a9f93b27d
--- /dev/null
+++ b/packages/trace-viewer/bundle.js
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import fs, { existsSync } from 'fs';
+import path from 'path';
+
+/**
+ * @returns {import('vite').Plugin}
+ */
+export function bundle() {
+  let config;
+  return {
+    name: 'playwright-bundle',
+    config(c) {
+      config = c;
+    },
+    transformIndexHtml: {
+      transform(html, ctx) {
+        if (!ctx || !ctx.bundle)
+          return html;
+        return html.replace(/(?=<!--)([\s\S]*?)-->/, '');
+      },
+    },
+  }
+}
\ No newline at end of file
diff --git a/packages/trace-viewer/vite.config.ts b/packages/trace-viewer/vite.config.ts
index 8a1cf5b2e8..d8c4543873 100644
--- a/packages/trace-viewer/vite.config.ts
+++ b/packages/trace-viewer/vite.config.ts
@@ -16,13 +16,15 @@
 
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
+import { bundle } from './bundle';
 import * as path from 'path';
 
 // https://vitejs.dev/config/
 export default defineConfig({
   base: '',
   plugins: [
-    react()
+    react(),
+    bundle()
   ],
   resolve: {
     alias: {