diff --git a/app/routes/app.blackouts._index.tsx b/app/routes/app.blackouts._index.tsx
index ce55f5c..4c9ea9d 100644
--- a/app/routes/app.blackouts._index.tsx
+++ b/app/routes/app.blackouts._index.tsx
@@ -1,3 +1,4 @@
+import { useState } from "react";
 import { data, type ActionFunctionArgs, type LoaderFunctionArgs } from "@remix-run/node";
 import { Form, useLoaderData, useNavigation } from "@remix-run/react";
 import {
@@ -71,6 +72,8 @@ export default function BlackoutsIndex() {
   const { locations, blackouts } = useLoaderData<typeof loader>();
   const navigation = useNavigation();
   const isSubmitting = navigation.state === "submitting";
+  const [date, setDate] = useState("");
+  const [reason, setReason] = useState("");
 
   if (locations.length === 0) {
     return (
@@ -140,7 +143,7 @@ export default function BlackoutsIndex() {
                 Add a blackout date
               </Text>
               <InlineStack gap="300" wrap>
-                <TextField label="Date" name="date" type="date" autoComplete="off" />
+                <TextField label="Date" name="date" type="date" autoComplete="off" value={date} onChange={setDate} />
                 <Select
                   label="Location"
                   name="locationId"
@@ -154,7 +157,7 @@ export default function BlackoutsIndex() {
                     ...METHODS.map((m) => ({ label: m.replace("_", " "), value: m })),
                   ]}
                 />
-                <TextField label="Reason (optional)" name="reason" autoComplete="off" />
+                <TextField label="Reason (optional)" name="reason" autoComplete="off" value={reason} onChange={setReason} />
               </InlineStack>
               <div>
                 <Button submit variant="primary" loading={isSubmitting}>
diff --git a/app/routes/app.locations.new.tsx b/app/routes/app.locations.new.tsx
index 65aa5ea..311015c 100644
--- a/app/routes/app.locations.new.tsx
+++ b/app/routes/app.locations.new.tsx
@@ -41,6 +41,8 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 export default function NewLocation() {
   const actionData = useActionData<typeof action>();
   const navigation = useNavigation();
+  const [name, setName] = useState("");
+  const [address, setAddress] = useState("");
   const [timezone, setTimezone] = useState(Intl.DateTimeFormat().resolvedOptions().timeZone);
 
   return (
@@ -61,10 +63,19 @@ export default function NewLocation() {
               label="Location name"
               name="name"
               autoComplete="off"
+              value={name}
+              onChange={setName}
               error={actionData?.errors?.name}
               requiredIndicator
             />
-            <TextField label="Address" name="address" autoComplete="off" multiline={2} />
+            <TextField
+              label="Address"
+              name="address"
+              autoComplete="off"
+              multiline={2}
+              value={address}
+              onChange={setAddress}
+            />
             <TextField
               label="Timezone (IANA, e.g. America/Toronto)"
               name="timezone"