diff --git a/components/Search.tsx b/components/Search.tsx
index e264d49..da0863a 100644
--- a/components/Search.tsx
+++ b/components/Search.tsx
@@ -1,4 +1,4 @@
-export default function Search(props: { defaultValue: string }) {
+export default function Search(props: { defaultValue: string | null }) {
   return (
     <form className="flex flex-col w-full lg:w-2/3 mx-auto my-4">
       <label className="sr-only" htmlFor="query">Program</label>
@@ -8,7 +8,7 @@ export default function Search(props: { defaultValue: string }) {
         className="border-2 rounded-md px-2"
         name="query"
         id="query"
-        defaultValue={props.defaultValue}
+        defaultValue={props.defaultValue ?? ""}
       />
       <button type="submit" className="my-2 bg-gray-100 border-2 border-gray-400 rounded-md">
         Søk
diff --git a/routes/index.tsx b/routes/index.tsx
index 288810d..dc55011 100644
--- a/routes/index.tsx
+++ b/routes/index.tsx
@@ -8,8 +8,7 @@ import { nrkRadio, SearchResultList } from "../lib/nrk.ts";
 import { CSS, render } from "$gfm";
 
 type Props = {
-  query: string;
-  origin: string;
+  query: string | null;
   rawMarkdown: string;
   result?: SearchResultList | null;
 };
@@ -23,11 +22,11 @@ export const handler: Handlers<Props> = {
       result = await nrkRadio.search(query);
     }
     const rawMarkdown = await Deno.readTextFile(new URL("../docs/what.md", import.meta.url));
-    return ctx.render({ query: query || "", result, origin: url.origin, rawMarkdown });
+    return ctx.render({ query, result, rawMarkdown });
   },
 };
 
-export default function Home({ data }: PageProps<Props>) {
+export default function Home({ data, url }: PageProps<Props>) {
   return (
     <>
       <Head>
@@ -46,7 +45,7 @@ export default function Home({ data }: PageProps<Props>) {
       <div className="p-4 mx-auto max-w-screen-md">
         <Header />
         <Search defaultValue={data.query} />
-        <SearchResult result={data.result} origin={data.origin} />
+        <SearchResult result={data.result} origin={url.origin} />
         <div
           class="markdown-body"
           dangerouslySetInnerHTML={{ __html: render(data?.rawMarkdown) }}
