diff --git a/package-lock.json b/package-lock.json
index e0861a606..b1ea0262e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -45,7 +45,7 @@
         "dotenv": "^16.5.0",
         "eslint": "^9",
         "eslint-config-next": "15.3.1",
-        "pagefind": "^1.3.0",
+        "pagefind": "^1.5.0",
         "postcss": "^8.5.3",
         "postcss-preset-mantine": "^1.17.0",
         "postcss-simple-vars": "^7.0.1",
@@ -1921,9 +1921,9 @@
       }
     },
     "node_modules/@pagefind/darwin-arm64": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@pagefind/darwin-arm64/-/darwin-arm64-1.3.0.tgz",
-      "integrity": "sha512-365BEGl6ChOsauRjyVpBjXybflXAOvoMROw3TucAROHIcdBvXk9/2AmEvGFU0r75+vdQI4LJdJdpH4Y6Yqaj4A==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@pagefind/darwin-arm64/-/darwin-arm64-1.5.0.tgz",
+      "integrity": "sha512-OXQVlxALU9+Lz/LxkAa+RvaxY1cnRKUDCuwl9o8PY5Lg/znP573y4WIbVOOIz8Bv7uj7r00TGy7pD+NSLMJGBw==",
       "cpu": [
         "arm64"
       ],
@@ -1935,9 +1935,9 @@
       ]
     },
     "node_modules/@pagefind/darwin-x64": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@pagefind/darwin-x64/-/darwin-x64-1.3.0.tgz",
-      "integrity": "sha512-zlGHA23uuXmS8z3XxEGmbHpWDxXfPZ47QS06tGUq0HDcZjXjXHeLG+cboOy828QIV5FXsm9MjfkP5e4ZNbOkow==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@pagefind/darwin-x64/-/darwin-x64-1.5.0.tgz",
+      "integrity": "sha512-+LK1Xq5n/B0hHc08DW61SnfIlfLKyXZ1oKcbfZ1MimE7Rn0Q6R0VI/TlC04f/JDPm+67zAOwPGizzvefOi5vqQ==",
       "cpu": [
         "x64"
       ],
@@ -1948,10 +1948,24 @@
         "darwin"
       ]
     },
+    "node_modules/@pagefind/freebsd-x64": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@pagefind/freebsd-x64/-/freebsd-x64-1.5.0.tgz",
+      "integrity": "sha512-kicDfUF9gn/z06NimTwNlZXF8z3pLsN3BIPPt6N8unuh0n55fr64tVs2p3a5RKYmQkJGjPfOE/C9GI5YTEpURg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
     "node_modules/@pagefind/linux-arm64": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@pagefind/linux-arm64/-/linux-arm64-1.3.0.tgz",
-      "integrity": "sha512-8lsxNAiBRUk72JvetSBXs4WRpYrQrVJXjlRRnOL6UCdBN9Nlsz0t7hWstRk36+JqHpGWOKYiuHLzGYqYAqoOnQ==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@pagefind/linux-arm64/-/linux-arm64-1.5.0.tgz",
+      "integrity": "sha512-e5rDB3wPm89bcSLiatKBDTrVTbsMQrrtkXRaAoUJYU0C1suXVvEzZfjmMvrUDvYhZBx/Ls8hGuGxlqSJBz3gDg==",
       "cpu": [
         "arm64"
       ],
@@ -1963,9 +1977,9 @@
       ]
     },
     "node_modules/@pagefind/linux-x64": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@pagefind/linux-x64/-/linux-x64-1.3.0.tgz",
-      "integrity": "sha512-hAvqdPJv7A20Ucb6FQGE6jhjqy+vZ6pf+s2tFMNtMBG+fzcdc91uTw7aP/1Vo5plD0dAOHwdxfkyw0ugal4kcQ==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@pagefind/linux-x64/-/linux-x64-1.5.0.tgz",
+      "integrity": "sha512-vh52DcBiF/mRMmq+Rwt3M3RgEWgl00jFk/M5NWhLEHJFq4+papQXwbyKbi7cNlxaeYrKx6wOfW3fm9cftfc/Kg==",
       "cpu": [
         "x64"
       ],
@@ -1976,10 +1990,24 @@
         "linux"
       ]
     },
+    "node_modules/@pagefind/windows-arm64": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@pagefind/windows-arm64/-/windows-arm64-1.5.0.tgz",
+      "integrity": "sha512-kg+szZwffZdyWn6SL6RHjAYjhSvJ2bT4qkv3KepGsbmD9fuSHUSC+2kydDneDVUA9qEDRf9uSFoEAsXsp1/JKA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@pagefind/windows-x64": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@pagefind/windows-x64/-/windows-x64-1.3.0.tgz",
-      "integrity": "sha512-BR1bIRWOMqkf8IoU576YDhij1Wd/Zf2kX/kCI0b2qzCKC8wcc2GQJaaRMCpzvCCrmliO4vtJ6RITp/AnoYUUmQ==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@pagefind/windows-x64/-/windows-x64-1.5.0.tgz",
+      "integrity": "sha512-8eOCmB8lnpyvwz+HrcTXLuBxhj7UseAFh6KGEXRe8UCcAfVQih+qPy/4akJRezViI+ONijz9oi7HpMkw9rdtBg==",
       "cpu": [
         "x64"
       ],
@@ -7710,20 +7738,22 @@
       }
     },
     "node_modules/pagefind": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/pagefind/-/pagefind-1.3.0.tgz",
-      "integrity": "sha512-8KPLGT5g9s+olKMRTU9LFekLizkVIu9tes90O1/aigJ0T5LmyPqTzGJrETnSw3meSYg58YH7JTzhTTW/3z6VAw==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/pagefind/-/pagefind-1.5.0.tgz",
+      "integrity": "sha512-7vQ2xh0ZmjPjsuWONR68nqzb+QNfpPh7pdT6n6YDAthWAQiUkSACVegSswY5zPNONGYFWebFVgdnS5/m/Qqn+w==",
       "dev": true,
       "license": "MIT",
       "bin": {
         "pagefind": "lib/runner/bin.cjs"
       },
       "optionalDependencies": {
-        "@pagefind/darwin-arm64": "1.3.0",
-        "@pagefind/darwin-x64": "1.3.0",
-        "@pagefind/linux-arm64": "1.3.0",
-        "@pagefind/linux-x64": "1.3.0",
-        "@pagefind/windows-x64": "1.3.0"
+        "@pagefind/darwin-arm64": "1.5.0",
+        "@pagefind/darwin-x64": "1.5.0",
+        "@pagefind/freebsd-x64": "1.5.0",
+        "@pagefind/linux-arm64": "1.5.0",
+        "@pagefind/linux-x64": "1.5.0",
+        "@pagefind/windows-arm64": "1.5.0",
+        "@pagefind/windows-x64": "1.5.0"
       }
     },
     "node_modules/parent-module": {
diff --git a/package.json b/package.json
index bd3623387..4f8c1ab3b 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "dotenv": "^16.5.0",
     "eslint": "^9",
     "eslint-config-next": "15.3.1",
-    "pagefind": "^1.3.0",
+    "pagefind": "^1.5.0",
     "postcss": "^8.5.3",
     "postcss-preset-mantine": "^1.17.0",
     "postcss-simple-vars": "^7.0.1",
diff --git a/src/components/SpotlightSearch.tsx b/src/components/SpotlightSearch.tsx
index b6ccf7fd3..d26a9400b 100644
--- a/src/components/SpotlightSearch.tsx
+++ b/src/components/SpotlightSearch.tsx
@@ -57,7 +57,7 @@ const SearchResult = ({
           id={`${result.id}-${subIdx}`}
           onClick={() => {
             router.push(
-              subResult.url.replace(/(\/[^?#]+)\.html(?=[?#]|$)/, "$1")
+              subResult.url.replace(/(\/[^?#]+)\.html(?=[?#]|$)/, "$1"),
             );
           }}
         >
@@ -83,7 +83,9 @@ const SearchResult = ({
               opacity={0.7}
               flex={2}
             >
-              {decode(subResult.excerpt.replace(/<\/?mark>/g, ""))}
+              {/* We use plain_excerpt instead of excerpt since we do the highlighting ourselves,
+                  see also https://github.com/Pagefind/pagefind/issues/815 */}
+              {decode(subResult.plain_excerpt)}
             </Highlight>
           </Group>
         </Spotlight.Action>
@@ -95,7 +97,7 @@ const SearchResult = ({
 type PagefindSubResult = {
   title: string;
   url: string;
-  excerpt: string;
+  plain_excerpt: string;
   anchor?: {
     element: string;
     id: string;
@@ -107,7 +109,7 @@ type PagefindSubResult = {
 type PagefindResultData = {
   url: string;
   content: string;
-  excerpt: string;
+  plain_excerpt: string;
   meta: {
     title: string;
     breadcrumbs?: string;
@@ -151,7 +153,7 @@ export default function SpotlightSearch() {
                     Promise.resolve({
                       url: "",
                       content: "",
-                      excerpt: "",
+                      plain_excerpt: "",
                       meta: {
                         title: `Error importing pagefind.js`,
                       },
@@ -159,7 +161,7 @@ export default function SpotlightSearch() {
                         {
                           title: "Error",
                           url: "",
-                          excerpt: `NOTE: Search only works with a static build, not in dev mode. Error: ${e}`,
+                          plain_excerpt: `NOTE: Search only works with a static build, not in dev mode. Error: ${e}`,
                         },
                       ],
                     }),