diff --git a/src/app/WardrobePage/ItemsPanel.js b/src/app/WardrobePage/ItemsPanel.js
index e010656..292c295 100644
--- a/src/app/WardrobePage/ItemsPanel.js
+++ b/src/app/WardrobePage/ItemsPanel.js
@@ -247,7 +247,10 @@ function OutfitHeading({ outfitState, dispatchToOutfit }) {
         <Box role="group" d="inline-block" position="relative" width="100%">
           <Heading1 mb="6">
             <Editable
-              value={outfitState.name}
+              // Make sure not to ever pass `undefined` into here, or else the
+              // component enters uncontrolled mode, and changing the value
+              // later won't fix it!
+              value={outfitState.name || ""}
               placeholder="Untitled outfit"
               onChange={(value) =>
                 dispatchToOutfit({ type: "rename", outfitName: value })
diff --git a/src/app/WardrobePage/useOutfitState.js b/src/app/WardrobePage/useOutfitState.js
index 719a1a7..855f70f 100644
--- a/src/app/WardrobePage/useOutfitState.js
+++ b/src/app/WardrobePage/useOutfitState.js
@@ -88,14 +88,15 @@ function useOutfitState() {
   // We also call `Array.from` on our item IDs. It's more convenient to manage
   // them as a Set in state, but most callers will find it more convenient to
   // access them as arrays! e.g. for `.map()`.
-  const outfit = outfitData?.outfit;
+  const outfit = outfitData?.outfit || null;
   const id = state.id;
-  const creator = outfit?.creator;
-  const name = state.name || outfit?.name;
-  const speciesId = state.speciesId || outfit?.petAppearance?.species?.id;
-  const colorId = state.colorId || outfit?.petAppearance?.color?.id;
-  const pose = state.pose || outfit?.petAppearance?.pose;
-  const appearanceId = state?.appearanceId;
+  const creator = outfit?.creator || null;
+  const name = state.name || outfit?.name || null;
+  const speciesId =
+    state.speciesId || outfit?.petAppearance?.species?.id || null;
+  const colorId = state.colorId || outfit?.petAppearance?.color?.id || null;
+  const pose = state.pose || outfit?.petAppearance?.pose || null;
+  const appearanceId = state.appearanceId || null;
   const wornItemIds = Array.from(
     state.wornItemIds || outfit?.wornItems?.map((i) => i.id)
   );