diff --git a/src/app/groups/[groupId]/expenses/[expenseId]/edit/page.tsx b/src/app/groups/[groupId]/expenses/[expenseId]/edit/page.tsx
index f3e2e1c..f005a05 100644
--- a/src/app/groups/[groupId]/expenses/[expenseId]/edit/page.tsx
+++ b/src/app/groups/[groupId]/expenses/[expenseId]/edit/page.tsx
@@ -7,13 +7,12 @@ export const metadata: Metadata = {
 }
 
 export default async function EditExpensePage({
-  params: { groupId, expenseId },
+  params: { expenseId },
 }: {
-  params: { groupId: string; expenseId: string }
+  params: { expenseId: string }
 }) {
   return (
     <EditExpenseForm
-      groupId={groupId}
       expenseId={expenseId}
       runtimeFeatureFlags={await getRuntimeFeatureFlags()}
     />
diff --git a/src/app/groups/[groupId]/expenses/edit-expense-form.tsx b/src/app/groups/[groupId]/expenses/edit-expense-form.tsx
index d762ec4..90dfdb0 100644
--- a/src/app/groups/[groupId]/expenses/edit-expense-form.tsx
+++ b/src/app/groups/[groupId]/expenses/edit-expense-form.tsx
@@ -2,19 +2,17 @@
 import { RuntimeFeatureFlags } from '@/lib/featureFlags'
 import { trpc } from '@/trpc/client'
 import { useRouter } from 'next/navigation'
+import { useCurrentGroup } from '../current-group-context'
 import { ExpenseForm } from './expense-form'
 
 export function EditExpenseForm({
-  groupId,
   expenseId,
   runtimeFeatureFlags,
 }: {
-  groupId: string
   expenseId: string
   runtimeFeatureFlags: RuntimeFeatureFlags
 }) {
-  const { data: groupData } = trpc.groups.get.useQuery({ groupId })
-  const group = groupData?.group
+  const { groupId, group } = useCurrentGroup()
 
   const { data: categoriesData } = trpc.categories.list.useQuery()
   const categories = categoriesData?.categories