diff --git a/packages/stack-server/src/components/data-table/team-table.tsx b/packages/stack-server/src/components/data-table/team-table.tsx
index 2d5dbae18..48fba61a3 100644
--- a/packages/stack-server/src/components/data-table/team-table.tsx
+++ b/packages/stack-server/src/components/data-table/team-table.tsx
@@ -124,7 +124,5 @@ const columns: ColumnDef<ServerTeam>[] =  [
 ];
 
 export function TeamTable(props: { teams: ServerTeam[] }) {
-  const teams = useMemo(() => props.teams.sort((a, b) => b.createdAt - a.createdAt), [props.teams]);
-
   return <DataTable data={props.teams} columns={columns} toolbarRender={toolbarRender} />;
 }
\ No newline at end of file
diff --git a/packages/stack-server/src/components/data-table/user-table.tsx b/packages/stack-server/src/components/data-table/user-table.tsx
index 2e17c4d52..228aef611 100644
--- a/packages/stack-server/src/components/data-table/user-table.tsx
+++ b/packages/stack-server/src/components/data-table/user-table.tsx
@@ -187,7 +187,7 @@ export function extendUsers(users: ServerUser[]): ExtendedServerUser[] {
     ...user,
     authType: (user.authWithEmail ? "email" : user.oauthProviders[0]) || "",
     emailVerified: user.primaryEmailVerified ? "verified" : "unverified",
-  })).sort((a, b) => b.signedUpAt - a.signedUpAt);
+  } satisfies ExtendedServerUser)).sort((a, b) => a.signedUpAt > b.signedUpAt ? -1 : 1);
 }
 
 export function UserTable(props: { users: ServerUser[] }) {