diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index c434c56..bbf7bd9 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -106,7 +106,7 @@ if [[ "$MODE" == "frontend" || "$MODE" == "dual" ||  "$MODE" == "standalone" ]];
     TITLE_ESCAPED=$(sed_escape "$TITLE_HTML_ESCAPED")
     sed -i "s/<title>LibreSpeed<\\/title>/<title>$TITLE_ESCAPED<\\/title>/g; s/<h1>LibreSpeed<\\/h1>/<h1>$TITLE_ESCAPED<\\/h1>/g" /var/www/html/index-classic.html
     sed -i "s/<title>LibreSpeed<\\/title>/<title>$TITLE_ESCAPED<\\/title>/g" /var/www/html/index.html
-    sed -i "s/<title>LibreSpeed - Free and Open Source Speedtest<\\/title>/<title>$TITLE_ESCAPED - Free and Open Source Speedtest<\\/title>/g" /var/www/html/index-modern.html
+    sed -i "s/<title>LibreSpeed - Free and Open Source Speedtest<\\/title>/<title>$TITLE_ESCAPED - Free and Open Source Speedtest<\\/title>/g; s/<h1>Free and Open Source Speedtest\\.<\\/h1>/<h1>$TITLE_ESCAPED<\\/h1>/g" /var/www/html/index-modern.html
   fi
   
   # Support legacy EMAIL env var as fallback for GDPR_EMAIL
diff --git a/tests/e2e/title-special-chars.spec.js b/tests/e2e/title-special-chars.spec.js
index 4fe9425..be0f054 100644
--- a/tests/e2e/title-special-chars.spec.js
+++ b/tests/e2e/title-special-chars.spec.js
@@ -7,6 +7,7 @@ test.describe('TITLE special characters', () => {
   test('modern page title supports umlauts and quotes', async ({ page }) => {
     await page.goto(`${baseUrls.standaloneNew}/index-modern.html`);
     await expect(page).toHaveTitle(`${specialTitle} - Free and Open Source Speedtest`);
+    await expect(page.locator('main > h1')).toHaveText(specialTitle);
   });
 
   test('classic heading supports umlauts and quotes', async ({ page }) => {