diff --git a/src/components/pages/closing/ClosingFinanceTable.tsx b/src/components/pages/closing/ClosingFinanceTable.tsx
index 7eb34369..010bfc2f 100644
--- a/src/components/pages/closing/ClosingFinanceTable.tsx
+++ b/src/components/pages/closing/ClosingFinanceTable.tsx
@@ -8,6 +8,7 @@ import {
   HppPurchaseData,
   ProfitLossDataAmount,
 } from '@/types/api/closing';
+import { useSearchParams } from 'next/navigation';
 import useSWR from 'swr';
 
 type HppTableRow =
@@ -55,9 +56,16 @@ const ClosingFinanceTable = ({
 }: {
   projectFlockId: number;
 }) => {
+  const searchParams = useSearchParams();
+  const kandangId = searchParams.get('kandangId');
+
   const { data: finance, isLoading } = useSWR(
-    `/closing/finance/${projectFlockId}`,
-    () => ClosingApi.getFinance(projectFlockId)
+    `/closing/finance/${projectFlockId}${kandangId ? `/${kandangId}` : ''}`,
+    () =>
+      ClosingApi.getFinance(
+        projectFlockId,
+        kandangId ? Number(kandangId) : undefined
+      )
   );
 
   const staticHppRows: Array<{
@@ -283,6 +291,7 @@ const ClosingFinanceTable = ({
           <div className='mt-6 p-0 mb-0'>
             <Table<HppTableRow>
               data={hppTableData}
+              isLoading={isLoading}
               columns={[
                 {
                   header: 'No.',
@@ -455,6 +464,7 @@ const ClosingFinanceTable = ({
           <div className='mt-6 p-0 mb-0'>
             <Table<ProfitLossTableRow>
               data={profitLossTableData}
+              isLoading={isLoading}
               columns={[
                 {
                   header: 'Jenis',
diff --git a/src/services/api/closing.ts b/src/services/api/closing.ts
index ff6a0bcb..b2ba2b8f 100644
--- a/src/services/api/closing.ts
+++ b/src/services/api/closing.ts
@@ -148,10 +148,11 @@ export class ClosingApiService extends BaseApiService<Closing, null, null> {
   }
 
   async getFinance(
-    id: number
+    id: number,
+    kandangId?: number
   ): Promise<BaseApiResponse<ClosingFinance> | undefined> {
     try {
-      const path = `${this.basePath}/${id}/keuangan`;
+      const path = `${this.basePath}/${id}${kandangId ? `/${kandangId}` : ''}/keuangan`;
       return await httpClient<BaseApiResponse<ClosingFinance>>(path, {
         method: 'GET',
       });