diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index a7c854d7fb..0fd9d399ac 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -335,6 +335,7 @@ export class Server extends AbstractServer {
 			// Route all UI urls to index.html to support history-api
 			const nonUIRoutes: Readonly<string[]> = [
 				'assets',
+				'static',
 				'types',
 				'healthz',
 				'metrics',
@@ -372,12 +373,12 @@ export class Server extends AbstractServer {
 
 			this.app.use(
 				'/',
+				historyApiHandler,
 				express.static(staticCacheDir, {
 					...cacheOptions,
 					setHeaders: setCustomCacheHeader,
 				}),
 				express.static(EDITOR_UI_DIST_DIR, cacheOptions),
-				historyApiHandler,
 			);
 		} else {
 			this.app.use('/', express.static(staticCacheDir, cacheOptions));