diff --git a/public/mockServiceWorker.js b/public/mockServiceWorker.js
index fead0b3ff..1f45c4cf8 100644
--- a/public/mockServiceWorker.js
+++ b/public/mockServiceWorker.js
@@ -2,15 +2,13 @@
 /* tslint:disable */
 
 /**
- * Mock Service Worker.
+ * Mock Service Worker (1.3.5).
  * @see https://github.com/mswjs/msw
  * - Please do NOT modify this file.
  * - Please do NOT serve this file on production.
  */
 
-const PACKAGE_VERSION = '2.6.6'
-const INTEGRITY_CHECKSUM = 'ca7800994cc8bfb5eb961e037c877074'
-const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
+const INTEGRITY_CHECKSUM = '3d6b9f06410d179a7f7404d4bf4c3c70'
 const activeClientIds = new Set()
 
 self.addEventListener('install', function () {
@@ -49,10 +47,7 @@ self.addEventListener('message', async function (event) {
     case 'INTEGRITY_CHECK_REQUEST': {
       sendToClient(client, {
         type: 'INTEGRITY_CHECK_RESPONSE',
-        payload: {
-          packageVersion: PACKAGE_VERSION,
-          checksum: INTEGRITY_CHECKSUM,
-        },
+        payload: INTEGRITY_CHECKSUM,
       })
       break
     }
@@ -62,12 +57,7 @@ self.addEventListener('message', async function (event) {
 
       sendToClient(client, {
         type: 'MOCKING_ENABLED',
-        payload: {
-          client: {
-            id: client.id,
-            frameType: client.frameType,
-          },
-        },
+        payload: true,
       })
       break
     }
@@ -96,6 +86,12 @@ self.addEventListener('message', async function (event) {
 
 self.addEventListener('fetch', function (event) {
   const { request } = event
+  const accept = request.headers.get('accept') || ''
+
+  // Bypass server-sent events.
+  if (accept.includes('text/event-stream')) {
+    return
+  }
 
   // Bypass navigation requests.
   if (request.mode === 'navigate') {
@@ -116,8 +112,29 @@ self.addEventListener('fetch', function (event) {
   }
 
   // Generate unique request ID.
-  const requestId = crypto.randomUUID()
-  event.respondWith(handleRequest(event, requestId))
+  const requestId = Math.random().toString(16).slice(2)
+
+  event.respondWith(
+    handleRequest(event, requestId).catch((error) => {
+      if (error.name === 'NetworkError') {
+        console.warn(
+          '[MSW] Successfully emulated a network error for the "%s %s" request.',
+          request.method,
+          request.url,
+        )
+        return
+      }
+
+      // At this point, any exception indicates an issue with the original request/response.
+      console.error(
+        `\
+[MSW] Caught an exception from the "%s %s" request (%s). This is probably not a problem with Mock Service Worker. There is likely an additional logging output above.`,
+        request.method,
+        request.url,
+        `${error.name}: ${error.message}`,
+      )
+    }),
+  )
 })
 
 async function handleRequest(event, requestId) {
@@ -129,24 +146,21 @@ async function handleRequest(event, requestId) {
   // this message will pend indefinitely.
   if (client && activeClientIds.has(client.id)) {
     ;(async function () {
-      const responseClone = response.clone()
-
-      sendToClient(
-        client,
-        {
-          type: 'RESPONSE',
-          payload: {
-            requestId,
-            isMockedResponse: IS_MOCKED_RESPONSE in response,
-            type: responseClone.type,
-            status: responseClone.status,
-            statusText: responseClone.statusText,
-            body: responseClone.body,
-            headers: Object.fromEntries(responseClone.headers.entries()),
-          },
+      const clonedResponse = response.clone()
+      sendToClient(client, {
+        type: 'RESPONSE',
+        payload: {
+          requestId,
+          type: clonedResponse.type,
+          ok: clonedResponse.ok,
+          status: clonedResponse.status,
+          statusText: clonedResponse.statusText,
+          body:
+            clonedResponse.body === null ? null : await clonedResponse.text(),
+          headers: Object.fromEntries(clonedResponse.headers.entries()),
+          redirected: clonedResponse.redirected,
         },
-        [responseClone.body],
-      )
+      })
     })()
   }
 
@@ -160,10 +174,6 @@ async function handleRequest(event, requestId) {
 async function resolveMainClient(event) {
   const client = await self.clients.get(event.clientId)
 
-  if (activeClientIds.has(event.clientId)) {
-    return client
-  }
-
   if (client?.frameType === 'top-level') {
     return client
   }
@@ -186,22 +196,20 @@ async function resolveMainClient(event) {
 
 async function getResponse(event, client, requestId) {
   const { request } = event
-
-  // Clone the request because it might've been already used
-  // (i.e. its body has been read and sent to the client).
-  const requestClone = request.clone()
+  const clonedRequest = request.clone()
 
   function passthrough() {
-    // Cast the request headers to a new Headers instance
-    // so the headers can be manipulated with.
-    const headers = new Headers(requestClone.headers)
+    // Clone the request because it might've been already used
+    // (i.e. its body has been read and sent to the client).
+    const headers = Object.fromEntries(clonedRequest.headers.entries())
 
-    // Remove the "accept" header value that marked this request as passthrough.
-    // This prevents request alteration and also keeps it compliant with the
-    // user-defined CORS policies.
-    headers.delete('accept', 'msw/passthrough')
+    // Remove MSW-specific request headers so the bypassed requests
+    // comply with the server's CORS preflight check.
+    // Operate with the headers as an object because request "Headers"
+    // are immutable.
+    delete headers['x-msw-bypass']
 
-    return fetch(requestClone, { headers })
+    return fetch(clonedRequest, { headers })
   }
 
   // Bypass mocking when the client is not active.
@@ -217,46 +225,57 @@ async function getResponse(event, client, requestId) {
     return passthrough()
   }
 
+  // Bypass requests with the explicit bypass header.
+  // Such requests can be issued by "ctx.fetch()".
+  if (request.headers.get('x-msw-bypass') === 'true') {
+    return passthrough()
+  }
+
   // Notify the client that a request has been intercepted.
-  const requestBuffer = await request.arrayBuffer()
-  const clientMessage = await sendToClient(
-    client,
-    {
-      type: 'REQUEST',
-      payload: {
-        id: requestId,
-        url: request.url,
-        mode: request.mode,
-        method: request.method,
-        headers: Object.fromEntries(request.headers.entries()),
-        cache: request.cache,
-        credentials: request.credentials,
-        destination: request.destination,
-        integrity: request.integrity,
-        redirect: request.redirect,
-        referrer: request.referrer,
-        referrerPolicy: request.referrerPolicy,
-        body: requestBuffer,
-        keepalive: request.keepalive,
-      },
+  const clientMessage = await sendToClient(client, {
+    type: 'REQUEST',
+    payload: {
+      id: requestId,
+      url: request.url,
+      method: request.method,
+      headers: Object.fromEntries(request.headers.entries()),
+      cache: request.cache,
+      mode: request.mode,
+      credentials: request.credentials,
+      destination: request.destination,
+      integrity: request.integrity,
+      redirect: request.redirect,
+      referrer: request.referrer,
+      referrerPolicy: request.referrerPolicy,
+      body: await request.text(),
+      bodyUsed: request.bodyUsed,
+      keepalive: request.keepalive,
     },
-    [requestBuffer],
-  )
+  })
 
   switch (clientMessage.type) {
     case 'MOCK_RESPONSE': {
       return respondWithMock(clientMessage.data)
     }
 
-    case 'PASSTHROUGH': {
+    case 'MOCK_NOT_FOUND': {
       return passthrough()
     }
+
+    case 'NETWORK_ERROR': {
+      const { name, message } = clientMessage.data
+      const networkError = new Error(message)
+      networkError.name = name
+
+      // Rejecting a "respondWith" promise emulates a network error.
+      throw networkError
+    }
   }
 
   return passthrough()
 }
 
-function sendToClient(client, message, transferrables = []) {
+function sendToClient(client, message) {
   return new Promise((resolve, reject) => {
     const channel = new MessageChannel()
 
@@ -268,28 +287,17 @@ function sendToClient(client, message, transferrables = []) {
       resolve(event.data)
     }
 
-    client.postMessage(
-      message,
-      [channel.port2].concat(transferrables.filter(Boolean)),
-    )
+    client.postMessage(message, [channel.port2])
   })
 }
 
-async function respondWithMock(response) {
-  // Setting response status code to 0 is a no-op.
-  // However, when responding with a "Response.error()", the produced Response
-  // instance will have status code set to 0. Since it's not possible to create
-  // a Response instance with status code 0, handle that use-case separately.
-  if (response.status === 0) {
-    return Response.error()
-  }
-
-  const mockedResponse = new Response(response.body, response)
-
-  Reflect.defineProperty(mockedResponse, IS_MOCKED_RESPONSE, {
-    value: true,
-    enumerable: true,
+function sleep(timeMs) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, timeMs)
   })
+}
 
-  return mockedResponse
+async function respondWithMock(response) {
+  await sleep(response.delay)
+  return new Response(response.body, response)
 }
diff --git a/src/langs/json/en.json b/src/langs/json/en.json
index 9fb065c5b..bccad5605 100644
--- a/src/langs/json/en.json
+++ b/src/langs/json/en.json
@@ -11,6 +11,7 @@
     "title": "Title"
   },
   "search": {
+    "loading": "Searching…",
     "matchingResults": "{n, plural, one {# matching result} other {# matching results}}",
     "reset": "Clear Search",
     "help": "Use filters like <code>user:</code>, <code>project:</code> or <code>organization:</code> to refine searches. Use <code>sort:</code> to order results.",
diff --git a/src/lib/components/viewer/Search.svelte b/src/lib/components/viewer/Search.svelte
index 53ae1ada1..2b27bd3a4 100644
--- a/src/lib/components/viewer/Search.svelte
+++ b/src/lib/components/viewer/Search.svelte
@@ -3,58 +3,65 @@ Assumes it's a child of a ViewerContext
  -->
 
 <script lang="ts">
-  import { onMount } from "svelte";
   import { _ } from "svelte-i18n";
-  import { Search24 } from "svelte-octicons";
+  import { Hourglass24, Search24 } from "svelte-octicons";
 
   import { page } from "$app/stores";
 
   import Empty from "../common/Empty.svelte";
 
-  import {
-    getCurrentPage,
-    getSearch,
-  } from "$lib/components/viewer/ViewerContext.svelte";
   import { getQuery, highlight, pageNumber } from "$lib/utils/search";
-  import { scrollToPage } from "$lib/utils/scroll";
   import { getViewerHref } from "$lib/utils/viewer";
   import Highlight from "../common/Highlight.svelte";
+  import type { APIResponse, Highlights } from "@/lib/api/types";
+  import { getDocument } from "./ViewerContext.svelte";
+  import { searchWithin } from "@/lib/api/documents";
+  import Error from "../common/Error.svelte";
 
-  const search = getSearch();
-  const currentPage = getCurrentPage();
+  const document = getDocument();
   let query = getQuery($page.url, "q");
 
   // Format page numbers, highlight search results, and remove invalid pages
-  $: resultsPages = Object.entries(search?.data ?? {})
-    .map<[number, string[]]>(([page, results]) => [
-      pageNumber(page),
-      results.map((result) => highlight(result, query)),
-    ])
-    .filter(([page]) => !isNaN(page));
+  function formatResults(results: APIResponse<Highlights>) {
+    if (results.error) throw new TypeError(results.error.message);
+    if (!results || !results.data)
+      throw new TypeError("Failed to get search results");
+    return Object.entries(results?.data ?? {})
+      .map<[number, string[]]>(([page, results]) => [
+        pageNumber(page),
+        results.map((result) => highlight(result, query)),
+      ])
+      .filter(([page]) => !isNaN(page));
+  }
 
-  onMount(async () => {
-    if ($currentPage > 1) {
-      scrollToPage($currentPage);
-    }
-  });
+  let search: Promise<[number, string[]][]>;
+  $: search = searchWithin($document.id, query).then(formatResults);
 </script>
 
 <div class="pages">
-  {#each resultsPages as [pageNumber, resultsList]}
-    <a
-      href={getViewerHref({ page: pageNumber, mode: "document", query })}
-      class="card"
-    >
-      <Highlight
-        title="{$_('documents.pageAbbrev')} {pageNumber}"
-        segments={resultsList}
-      />
-    </a>
-  {:else}
-    <Empty icon={Search24}>
-      <h2>{$_("search.empty")}</h2>
+  {#await search}
+    <Empty icon={Hourglass24}>
+      {$_("search.loading")}
     </Empty>
-  {/each}
+  {:then resultsPages}
+    {#each resultsPages as [pageNumber, resultsList]}
+      <a
+        href={getViewerHref({ page: pageNumber, mode: "document", query })}
+        class="card"
+      >
+        <Highlight
+          title="{$_('documents.pageAbbrev')} {pageNumber}"
+          segments={resultsList}
+        />
+      </a>
+    {:else}
+      <Empty icon={Search24}>
+        {$_("search.empty")}
+      </Empty>
+    {/each}
+  {:catch err}
+    <Error>{err.message}</Error>
+  {/await}
 </div>
 
 <style>
diff --git a/src/lib/components/viewer/ViewerContext.svelte b/src/lib/components/viewer/ViewerContext.svelte
index c938acbdf..09d9f3e7d 100644
--- a/src/lib/components/viewer/ViewerContext.svelte
+++ b/src/lib/components/viewer/ViewerContext.svelte
@@ -48,10 +48,6 @@ layouts, stories, and tests.
     return getContext("asset_url");
   }
 
-  export function getSearch(): Maybe<APIResponse<Highlights, null>> {
-    return getContext("search");
-  }
-
   export function isEmbedded(): boolean {
     // are we embedded?
     return getContext("embed") ?? false;
@@ -98,7 +94,6 @@ layouts, stories, and tests.
   export let text: Promise<Maybe<DocumentText>> = new Promise(() => {});
   export let note: Nullable<Note> = null;
   export let asset_url: URL = pdfUrl(document);
-  export let search: Maybe<APIResponse<Highlights, null>> = undefined;
   export let embed: boolean = false;
   export let page: number = 1;
   export let mode: ViewerMode = "document";
@@ -124,7 +119,6 @@ layouts, stories, and tests.
   setContext("document", documentStore);
   setContext("text", text);
   setContext("asset_url", asset_url);
-  setContext("search", search);
   setContext("embed", embed);
   setContext("newNote", writable(null));
   setContext("currentNote", writable(note));
diff --git a/src/lib/components/viewer/stories/Search.stories.svelte b/src/lib/components/viewer/stories/Search.stories.svelte
index 66c50ba95..e18c448f5 100644
--- a/src/lib/components/viewer/stories/Search.stories.svelte
+++ b/src/lib/components/viewer/stories/Search.stories.svelte
@@ -8,7 +8,8 @@
     parameters: { layout: "centered" },
   };
 
-  import { document, searchWithin } from "@/test/fixtures/documents";
+  import { document } from "@/test/fixtures/documents";
+  import { searchWithin } from "@/test/handlers/documents";
   import text from "@/test/fixtures/documents/document.txt.json";
 
   import ViewerContext from "../ViewerContext.svelte";
@@ -21,6 +22,7 @@
 <Story
   name="Empty"
   parameters={{
+    msw: { handlers: [searchWithin.empty] },
     sveltekit_experimental: {
       stores: {
         page: {
@@ -32,19 +34,15 @@
     },
   }}
 >
-  <ViewerContext
-    {document}
-    text={Promise.resolve(text)}
-    search={empty}
-    mode="search"
-  >
+  <ViewerContext {document} text={Promise.resolve(text)} mode="search">
     <Search />
   </ViewerContext>
 </Story>
 
 <Story
-  name="With Results"
+  name="With Data"
   parameters={{
+    msw: { handlers: [searchWithin.data] },
     sveltekit_experimental: {
       stores: {
         page: {
@@ -56,12 +54,47 @@
     },
   }}
 >
-  <ViewerContext
-    {document}
-    text={Promise.resolve(text)}
-    search={{ data: searchWithin }}
-    mode="search"
-  >
+  <ViewerContext {document} text={Promise.resolve(text)} mode="search">
+    <Search />
+  </ViewerContext>
+</Story>
+
+<Story
+  name="Loading"
+  parameters={{
+    msw: { handlers: [searchWithin.loading] },
+    sveltekit_experimental: {
+      stores: {
+        page: {
+          url: new URL(
+            `https://www.dev.documentcloud.org/documents/20000040-the-santa-anas/?q=${query}`,
+          ),
+        },
+      },
+    },
+  }}
+>
+  <ViewerContext {document} text={Promise.resolve(text)} mode="search">
+    <Search />
+  </ViewerContext>
+</Story>
+
+<Story
+  name="With Error"
+  parameters={{
+    msw: { handlers: [searchWithin.error] },
+    sveltekit_experimental: {
+      stores: {
+        page: {
+          url: new URL(
+            `https://www.dev.documentcloud.org/documents/20000040-the-santa-anas/?q=${query}`,
+          ),
+        },
+      },
+    },
+  }}
+>
+  <ViewerContext {document} text={Promise.resolve(text)} mode="search">
     <Search />
   </ViewerContext>
 </Story>
diff --git a/src/routes/(app)/documents/[id]-[slug]/+page.svelte b/src/routes/(app)/documents/[id]-[slug]/+page.svelte
index eec711156..2d91a71ac 100644
--- a/src/routes/(app)/documents/[id]-[slug]/+page.svelte
+++ b/src/routes/(app)/documents/[id]-[slug]/+page.svelte
@@ -18,7 +18,6 @@
 
   $: document = data.document;
   $: mode = data.mode;
-  $: search = data.search;
   $: text = browser
     ? documents.text(document)
     : Promise.resolve({ pages: [], updated: 0 });
@@ -65,7 +64,7 @@
   />
 </svelte:head>
 
-<ViewerContext {document} {mode} {text} {asset_url} {search}>
+<ViewerContext {document} {mode} {text} {asset_url}>
   <DocumentLayout {action} />
 </ViewerContext>
 <GuidedTour />
diff --git a/src/routes/(app)/documents/[id]-[slug]/+page.ts b/src/routes/(app)/documents/[id]-[slug]/+page.ts
index de51e723a..63110c1eb 100644
--- a/src/routes/(app)/documents/[id]-[slug]/+page.ts
+++ b/src/routes/(app)/documents/[id]-[slug]/+page.ts
@@ -21,7 +21,7 @@ export async function load({
   url,
   setHeaders,
 }) {
-  const { document, asset_url, mode, search } = await loadDocument({
+  const { document, asset_url, mode } = await loadDocument({
     fetch,
     params,
     url,
@@ -58,7 +58,6 @@ export async function load({
     document,
     mode,
     asset_url,
-    search,
     action,
     breadcrumbs,
   };
diff --git a/src/test/handlers/documents.ts b/src/test/handlers/documents.ts
index 4b411b20f..9e95e621a 100644
--- a/src/test/handlers/documents.ts
+++ b/src/test/handlers/documents.ts
@@ -2,6 +2,8 @@ import { rest } from "msw";
 import { BASE_API_URL } from "@/config/config.js";
 
 import { documents as docs, pending } from "../fixtures/documents/pending";
+import { searchWithin as searchWithinResults } from "../fixtures/documents";
+import { generateGetHandler } from "./utils";
 
 const documentsUrl = new URL(`/api/documents/*`, BASE_API_URL).href;
 
@@ -31,3 +33,8 @@ export const revisionControl = {
     ),
   ),
 };
+
+export const searchWithin = generateGetHandler(
+  "documents/:id/search",
+  searchWithinResults,
+);