diff --git a/modules/benchmarks/src/expanding_rows/BUILD.bazel b/modules/benchmarks/src/expanding_rows/BUILD.bazel
index 08362e9e72..9b1f32f75f 100644
--- a/modules/benchmarks/src/expanding_rows/BUILD.bazel
+++ b/modules/benchmarks/src/expanding_rows/BUILD.bazel
@@ -32,7 +32,7 @@ ts_library(
 
 ng_rollup_bundle(
     name = "bundle",
-    entry_point = ":index.ts",
+    entry_point = ":index_aot.ts",
     deps = [
         ":application_lib",
         "@npm//rxjs",
@@ -41,26 +41,30 @@ ng_rollup_bundle(
 
 ts_devserver(
     name = "prodserver",
+    index_html = "index.html",
+    port = 4200,
     static_files = [
-        ":bundle.min_debug.js",
-        ":bundle.min.js",
         "@npm//:node_modules/zone.js/dist/zone.js",
-        "index.html",
+    ],
+    deps = [
+        ":bundle.min.js",
     ],
 )
 
 ts_devserver(
     name = "devserver",
-    entry_module = "angular/modules/benchmarks/src/expanding_rows/index",
-    index_html = "index.html",
+    entry_module = "angular/modules/benchmarks/src/expanding_rows/index_aot",
+    # Uncomment this to run devserver. This is due to limitation of ts_devserver
+    # that produces `index.html` by default so there cannot be two ts_devserver
+    # rules in a single Bazel package.
+    # index_html = "index.html",
+    port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    serving_path = "/index.js",
     static_files = [
         "@npm//:node_modules/zone.js/dist/zone.js",
-        "index.html",
     ],
     deps = [":application_lib"],
 )
diff --git a/modules/benchmarks/src/expanding_rows/index.html b/modules/benchmarks/src/expanding_rows/index.html
index 402a1fc8d8..802754abdd 100644
--- a/modules/benchmarks/src/expanding_rows/index.html
+++ b/modules/benchmarks/src/expanding_rows/index.html
@@ -11,29 +11,7 @@
   <h1>Change Detection Benchmark</h1>
   <div id="rendererMode">...</div>
 
-  <benchmark-root>loading...</benchmark-root>
-
-  <script>
-    addEventListener('DOMContentLoaded', () => {
-      // DevServer has automatic bootstrap code, so if we already have <scripts> than we don't need to bootstrap
-      var alreadyBootstraped = document.querySelectorAll('script').length > 1; // 1 for ourselves
-      if (!alreadyBootstraped) {
-        function loadScript(url) {
-          return new Promise(function (resolve, reject) {
-            var script = document.createElement('script');
-            script.src = url;
-            script.onload = resolve;
-            script.onerror = reject;
-            document.body.append(script);
-          });
-        }
-        // zone.js must be loaded and processed before Angular bundle gets executed
-        loadScript('/npm/node_modules/zone.js/dist/zone.js').then(function () {
-          loadScript(document.location.search.endsWith('debug') ? 'bundle.min_debug.js' : 'bundle.min.js');
-        });
-      }
-    });
-  </script>
+  <benchmark-root>Loading...</benchmark-root>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/modules/benchmarks/src/expanding_rows/index.ts b/modules/benchmarks/src/expanding_rows/index_aot.ts
similarity index 100%
rename from modules/benchmarks/src/expanding_rows/index.ts
rename to modules/benchmarks/src/expanding_rows/index_aot.ts