diff --git a/frontend/src/api/api.ts b/frontend/src/api/api.ts
index c77ba75..43e38cb 100644
--- a/frontend/src/api/api.ts
+++ b/frontend/src/api/api.ts
@@ -259,7 +259,7 @@ export interface SearchUsersResponse {
 export async function searchUsers(
   leaderboardId: string,
   query: string = "",
-  limit: number = 20
+  limit?: number
 ): Promise<SearchUsersResponse> {
   const params = new URLSearchParams();
   if (query) params.set("q", query);
diff --git a/frontend/src/pages/leaderboard/components/UserTrendChart.tsx b/frontend/src/pages/leaderboard/components/UserTrendChart.tsx
index 2c3932c..94c9efd 100644
--- a/frontend/src/pages/leaderboard/components/UserTrendChart.tsx
+++ b/frontend/src/pages/leaderboard/components/UserTrendChart.tsx
@@ -103,8 +103,7 @@ export default function UserTrendChart({ leaderboardId }: UserTrendChartProps) {
     const searchTimeout = setTimeout(async () => {
       setSearchLoading(true);
       try {
-        const limit = inputValue === "" ? 5 : 20;
-        const result = await searchUsers(leaderboardId, inputValue, limit);
+        const result = await searchUsers(leaderboardId, inputValue);
         setUserOptions(result.users);
       } catch (err) {
         console.error("Failed to search users:", err);
@@ -185,6 +184,9 @@ export default function UserTrendChart({ leaderboardId }: UserTrendChartProps) {
           );
         }}
         noOptionsText="No users found"
+        slotProps={{
+          listbox: { style: { maxHeight: 300 } },
+        }}
         sx={{ minWidth: 350, flexGrow: 1, maxWidth: 500 }}
       />
       {gpuTypes.length > 0 && (