diff --git a/src/app/hack/[slug]/edit/page.tsx b/src/app/hack/[slug]/edit/page.tsx
index 56a9e30..2635075 100644
--- a/src/app/hack/[slug]/edit/page.tsx
+++ b/src/app/hack/[slug]/edit/page.tsx
@@ -13,7 +13,7 @@ export default async function EditHackPage({ params }: EditPageProps) {
   const supabase = await createClient();
   const { data: { user } } = await supabase.auth.getUser();
   if (!user) {
-    redirect(`/login?redirectTo=%2Fhack%2F${encodeURIComponent(slug)}%2Fedit`);
+    redirect(`/hack/${slug}`);
   }
 
   const { data: hack } = await supabase
@@ -22,7 +22,9 @@ export default async function EditHackPage({ params }: EditPageProps) {
     .eq("slug", slug)
     .maybeSingle();
   if (!hack) return notFound();
-  if (hack.created_by !== user!.id) notFound();
+  if (hack.created_by !== user!.id) {
+    redirect(`/hack/${slug}`);
+  }
 
   let coverKeys: string[] = [];
   let signedCoverUrls: string[] = [];
diff --git a/src/app/hack/[slug]/edit/patch/page.tsx b/src/app/hack/[slug]/edit/patch/page.tsx
index d7de3da..868125a 100644
--- a/src/app/hack/[slug]/edit/patch/page.tsx
+++ b/src/app/hack/[slug]/edit/patch/page.tsx
@@ -13,7 +13,7 @@ export default async function EditPatchPage({ params }: EditPatchPageProps) {
   const supabase = await createClient();
   const { data: { user } } = await supabase.auth.getUser();
   if (!user) {
-    redirect(`/login?redirectTo=%2Fhack%2F${encodeURIComponent(slug)}%2Fedit%2Fpatch`);
+    redirect(`/hack/${slug}`);
   }
 
   const { data: hack } = await supabase
@@ -22,7 +22,9 @@ export default async function EditPatchPage({ params }: EditPatchPageProps) {
     .eq("slug", slug)
     .maybeSingle();
   if (!hack) return notFound();
-  if (hack.created_by !== user!.id) return notFound();
+  if (hack.created_by !== user!.id) {
+    redirect(`/hack/${slug}`);
+  }
 
   const { data: patchRows } = await supabase
     .from("patches")