diff --git a/src/app/[locale]/dashboard/logs/_components/usage-logs-filters.tsx b/src/app/[locale]/dashboard/logs/_components/usage-logs-filters.tsx
index e49af3fb8..4a3a0ec9e 100644
--- a/src/app/[locale]/dashboard/logs/_components/usage-logs-filters.tsx
+++ b/src/app/[locale]/dashboard/logs/_components/usage-logs-filters.tsx
@@ -105,6 +105,13 @@ export function UsageLogsFilters({
     return dynamicOnly;
   }, [dynamicStatusCodes]);
 
+  const userMap = useMemo(() => new Map(users.map((user) => [user.id, user.name])), [users]);
+
+  const providerMap = useMemo(
+    () => new Map(providers.map((provider) => [provider.id, provider.name])),
+    [providers]
+  );
+
   const [keys, setKeys] = useState<Key[]>(initialKeys);
   const [localFilters, setLocalFilters] = useState(filters);
   const [isExporting, setIsExporting] = useState(false);
@@ -285,8 +292,7 @@ export function UsageLogsFilters({
                   className="w-full justify-between"
                 >
                   {localFilters.userId ? (
-                    (users.find((user) => user.id === localFilters.userId)?.name ??
-                    localFilters.userId.toString())
+                    (userMap.get(localFilters.userId) ?? localFilters.userId.toString())
                   ) : (
                     <span className="text-muted-foreground">
                       {isUsersLoading ? t("logs.stats.loading") : t("logs.filters.allUsers")}
@@ -392,8 +398,7 @@ export function UsageLogsFilters({
                   className="w-full justify-between"
                 >
                   {localFilters.providerId ? (
-                    (providers.find((provider) => provider.id === localFilters.providerId)?.name ??
-                    localFilters.providerId.toString())
+                    (providerMap.get(localFilters.providerId) ?? localFilters.providerId.toString())
                   ) : (
                     <span className="text-muted-foreground">
                       {isProvidersLoading
diff --git a/src/repository/usage-logs.ts b/src/repository/usage-logs.ts
index 845f492bb..d3f4d3d4d 100644
--- a/src/repository/usage-logs.ts
+++ b/src/repository/usage-logs.ts
@@ -184,7 +184,7 @@ export async function findUsageLogsBatch(
     .select({
       id: messageRequest.id,
       createdAt: messageRequest.createdAt,
-      createdAtRaw: sql<string>`to_char(${messageRequest.createdAt}, 'YYYY-MM-DD"T"HH24:MI:SS.US"Z"')`,
+      createdAtRaw: sql<string>`to_char(${messageRequest.createdAt} AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.US"Z"')`,
       sessionId: messageRequest.sessionId,
       requestSequence: messageRequest.requestSequence,
       userName: users.name,
diff --git a/src/repository/user.ts b/src/repository/user.ts
index 392d70665..e1963da1c 100644
--- a/src/repository/user.ts
+++ b/src/repository/user.ts
@@ -186,7 +186,7 @@ export async function findUserListBatch(
       providerGroup: users.providerGroup,
       tags: users.tags,
       createdAt: users.createdAt,
-      createdAtRaw: sql<string>`to_char(${users.createdAt}, 'YYYY-MM-DD"T"HH24:MI:SS.US"Z"')`,
+      createdAtRaw: sql<string>`to_char(${users.createdAt} AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.US"Z"')`,
       updatedAt: users.updatedAt,
       deletedAt: users.deletedAt,
       limit5hUsd: users.limit5hUsd,