diff --git a/web/vite/src/OrderSet.tsx b/web/vite/src/OrderSet.tsx
index fc411a5..85fffa8 100644
--- a/web/vite/src/OrderSet.tsx
+++ b/web/vite/src/OrderSet.tsx
@@ -77,10 +77,12 @@ type FormOrderSet = Omit<OrderSet, "orders" | "punishment_pool_id"> & {
 export const OrderSet: React.FC = () => {
   const navigate = useNavigate();
   const { username, set_id } = useParams();
-  const { orderSets, orderSet } = useLoaderData<{
+  const loaderData = useLoaderData<{
     orderSets: Pick<OrderSet, "id" | "name">[];
     orderSet: OrderSet;
   }>();
+  const orderSet = loaderData?.orderSet;
+  const orderSets = loaderData?.orderSets || [];
   const [showScheduling, setShowScheduling] = React.useState(
     orderSet?.scheduled,
   );