diff --git a/packages/api/src/resolvers/api_key/index.ts b/packages/api/src/resolvers/api_key/index.ts
index f6c067e75..5ef001fc4 100644
--- a/packages/api/src/resolvers/api_key/index.ts
+++ b/packages/api/src/resolvers/api_key/index.ts
@@ -34,7 +34,10 @@ export const apiKeysResolver = authorized<ApiKeysSuccess, ApiKeysError>(
       const apiKeys = await getRepository(ApiKey).find({
         select: ['id', 'name', 'scopes', 'expiresAt', 'createdAt', 'usedAt'],
         where: { user: { id: uid } },
-        order: { usedAt: 'DESC', createdAt: 'DESC' },
+        order: {
+          usedAt: { direction: 'DESC', nulls: 'last' },
+          createdAt: 'DESC',
+        },
       })
 
       return {
diff --git a/packages/web/pages/settings/api-keys.tsx b/packages/web/pages/settings/api-keys.tsx
index 012d1759f..c1617ca85 100644
--- a/packages/web/pages/settings/api-keys.tsx
+++ b/packages/web/pages/settings/api-keys.tsx
@@ -35,7 +35,9 @@ export default function ApiKeys(): JSX.Element {
       rows.set(apiKey.id, {
         name: apiKey.name,
         scopes: apiKey.scopes.join(', ') || 'All',
-        usedAt: apiKey.usedAt?.toISOString() || 'Never used',
+        usedAt: apiKey.usedAt
+          ? new Date(apiKey.usedAt).toISOString()
+          : 'Never used',
         expiresAt: new Date(apiKey.expiresAt).toDateString(),
       })
     )