diff --git a/src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx b/src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx
index dd57a37f..cfa797d2 100644
--- a/src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx
+++ b/src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx
@@ -50,12 +50,14 @@ const ProjectFlockDetail = ({
     (kandang) => kandang.id === Number(selectedKandangId)
   );
 
+  // Cek apakah ada project aktif di kandang yang sama (selain project saat ini)
+  // Hanya boleh 1 kandang aktif, jadi jika ada project lain yang aktif, tidak bisa di-unclose baik kategori growing maupun laying
   const hasActiveProjectWithSameKandang = isResponseSuccess(projectFlockRawData)
     ? projectFlockRawData.data.some((pf) =>
         pf.kandangs?.some(
           (k) =>
             k.id === Number(selectedKandangId) &&
-            k.closed_at &&
+            pf.id !== projectFlock.id &&
             k.status !== 'NON_ACTIVE'
         )
       )
@@ -64,8 +66,7 @@ const ProjectFlockDetail = ({
   const isCloseButtonDisabled =
     !selectedKandangId ||
     projectFlock?.approval?.step_number == 1 ||
-    (projectFlock?.category === 'GROWING' &&
-      selectedKandang?.status === 'NON_ACTIVE' &&
+    (selectedKandang?.status === 'NON_ACTIVE' &&
       hasActiveProjectWithSameKandang);
 
   const { data: projectFlockApprovalResponse } = useSWR(