diff --git a/src/server/actions/dashboard/tables/assignTeamToTable.ts b/src/server/actions/dashboard/tables/assignTeamToTable.ts
index 7a0d949..a7f62bd 100644
--- a/src/server/actions/dashboard/tables/assignTeamToTable.ts
+++ b/src/server/actions/dashboard/tables/assignTeamToTable.ts
@@ -15,9 +15,29 @@ const assignTeamToTable = async ({
 }: AssignTeamToTableInput) => {
   await requireAdminSession();
 
+  const team = await prisma.team.findFirst({
+    where: {
+      id: teamId,
+    },
+    select: {
+      members: {
+        select: {
+          hackathonId: true,
+        },
+      },
+    },
+  });
+
+  if (!team || team.members.length === 0) {
+    throw new ExpectedServerActionError("Team not found");
+  }
+
+  const hackathonId = team.members[0].hackathonId;
+
   const table = await prisma.table.findFirst({
     where: {
       code: tableCode,
+      hackathonId,
     },
     select: {
       id: true,
@@ -28,27 +48,16 @@ const assignTeamToTable = async ({
     throw new ExpectedServerActionError("Table not found");
   }
 
-  const { members } = await prisma.team.update({
+  await prisma.team.update({
     where: {
       id: teamId,
     },
     data: {
       tableId: table.id,
     },
-    select: {
-      members: {
-        select: {
-          hackathonId: true,
-        },
-      },
-    },
   });
 
-  if (members.length === 0) {
-    throw new ExpectedServerActionError("Team not found");
-  }
-
-  revalidatePath(`/dashboard/${members[0].hackathonId}/tables`);
+  revalidatePath(`/dashboard/${hackathonId}/tables`);
 };
 
 export default assignTeamToTable;