diff --git a/src/lib/server/daily-fruit.ts b/src/lib/server/daily-fruit.ts
index bda237c..be23026 100644
--- a/src/lib/server/daily-fruit.ts
+++ b/src/lib/server/daily-fruit.ts
@@ -1,6 +1,6 @@
 import { db } from '$lib/server/db';
 import { character, devilFruit, devilFruitHistory, type DevilFruit, type Character } from '$lib/server/db/schema';
-import { desc, eq, and } from 'drizzle-orm';
+import { eq, and } from 'drizzle-orm';
 
 // Generate or get random seed for daily fruit selection
 const RANDOM_SEED = Math.random();
@@ -42,6 +42,7 @@ export async function getCharactersWithDevilFruit(): Promise<CharacterWithFruit[
 		.select(characterWithFruitSelect)
 		.from(character)
 		.leftJoin(devilFruit, eq(character.devilFruitId, devilFruit.id))
+		.where(eq(character.isInDailyMode, true))
 		.all()) as any[];
 
 	return rows.filter((r) => r.devilFruitId) as CharacterWithFruit[];
@@ -52,6 +53,7 @@ export async function getAllDevilFruitsFromCharacters(): Promise<DevilFruit[]> {
 		.select(characterWithFruitSelect)
 		.from(character)
 		.leftJoin(devilFruit, eq(character.devilFruitId, devilFruit.id))
+		.where(eq(character.isInDailyMode, true))
 		.all()) as any[];
 
 	const map = new Map<string, DevilFruit>();
diff --git a/src/routes/(game)/daily/fruit/+page.server.ts b/src/routes/(game)/daily/fruit/+page.server.ts
index a1090e5..2204c2a 100644
--- a/src/routes/(game)/daily/fruit/+page.server.ts
+++ b/src/routes/(game)/daily/fruit/+page.server.ts
@@ -1,6 +1,6 @@
 import { error } from '@sveltejs/kit';
 import { getAllDevilFruitsFromCharacters, getOrCreateTodayFruit, getYesterdayFruit, getTodayFruitWinsCount } from '$lib/server/daily-fruit';
-import { getAllCharacters } from '$lib/server/daily-character';
+import { getDailyModeCharacters } from '$lib/server/daily-character';
 
 export async function load(event) {
     const fruits = await getAllDevilFruitsFromCharacters();
@@ -12,8 +12,8 @@ export async function load(event) {
 
     const yesterdayFruit = await getYesterdayFruit(new Date());
 
-    // Load all characters for searching and filter only those with a devil fruit
-    const allCharacters = await getAllCharacters();
+    // Load daily-mode characters for searching and filter only those with a devil fruit
+    const allCharacters = await getDailyModeCharacters();
     const characters = allCharacters.filter((c) => c.devilFruitId);
 
     // Find the character tied to the chosen fruit among characters that have a devil fruit