diff --git a/src/components/pages/expense/form/ExpenseKandangsTable.tsx b/src/components/pages/expense/form/ExpenseKandangsTable.tsx
index 78b53541..b3c9f46d 100644
--- a/src/components/pages/expense/form/ExpenseKandangsTable.tsx
+++ b/src/components/pages/expense/form/ExpenseKandangsTable.tsx
@@ -145,12 +145,19 @@ const ExpenseKandangsTable = ({
       );
 
       onChange(formattedSelectedKandangs);
+    } else {
+      onChange([]);
     }
   }, [rowSelection]);
 
   useEffect(() => {
-    setRowSelection({});
-  }, [locationId]);
+    if (
+      selectedKandangs.length === 0 &&
+      Object.keys(rowSelection).length !== 0
+    ) {
+      setRowSelection({});
+    }
+  }, [selectedKandangs]);
 
   // track sorting
   useEffect(() => {