diff --git a/src/figma-make/components/pages/daily-checklist/DailyChecklistContent.tsx b/src/figma-make/components/pages/daily-checklist/DailyChecklistContent.tsx
index 80c13f01..0f86f7e9 100644
--- a/src/figma-make/components/pages/daily-checklist/DailyChecklistContent.tsx
+++ b/src/figma-make/components/pages/daily-checklist/DailyChecklistContent.tsx
@@ -184,6 +184,11 @@ export function DailyChecklistContent() {
   const [emptyKandangEndDateError, setEmptyKandangEndDateError] =
     useState<string>('');
 
+  const [preloadedKandang, setPreloadedKandang] = useState<{
+    id: string;
+    name: string;
+  } | null>(null);
+
   const [existingDocuments, setExistingDocuments] = useState<Document[]>([]);
   const [documents, setDocuments] = useState<File[]>([]);
   const [deletedDocumentIds, setDeletedDocumentIds] = useState<number[]>([]);
@@ -228,7 +233,11 @@ export function DailyChecklistContent() {
         const rawDate = data.date || '';
         setDate(rawDate.length > 10 ? rawDate.slice(0, 10) : rawDate);
         skipKandangClearRef.current = true;
-        setKandangId(String(data.kandang?.id || ''));
+        const loadedKandangId = String(data.kandang?.id || '');
+        setKandangId(loadedKandangId);
+        if (data.kandang?.name) {
+          setPreloadedKandang({ id: loadedKandangId, name: data.kandang.name });
+        }
 
         const isEmptyKandang =
           !!data.empty_kandang || data.category === 'empty_kandang';
@@ -1162,9 +1171,17 @@ export function DailyChecklistContent() {
                     <SelectValue placeholder='Pilih kandang' />
                   </SelectTrigger>
                   <SelectContent onScroll={handleKandangScroll}>
-                    {kandangOptions.map((kandang) => (
+                    {preloadedKandang &&
+                      !kandangOptions.some(
+                        (k) => String(k.value) === preloadedKandang.id
+                      ) && (
+                        <SelectItem value={preloadedKandang.id}>
+                          {preloadedKandang.name}
+                        </SelectItem>
+                      )}
+                    {kandangOptions.map((kandang, kandangIdx) => (
                       <SelectItem
-                        key={kandang.value}
+                        key={`${kandang.value}-${kandangIdx}`}
                         value={String(kandang.value)}
                       >
                         {kandang.label}