diff --git a/Plan/react/dashboard/src/components/cards/common/AddressListCard.jsx b/Plan/react/dashboard/src/components/cards/common/AddressListCard.jsx
index 679672a1b..85fda0db8 100644
--- a/Plan/react/dashboard/src/components/cards/common/AddressListCard.jsx
+++ b/Plan/react/dashboard/src/components/cards/common/AddressListCard.jsx
@@ -19,7 +19,6 @@ const AddressListCard = ({n, group, editGroup, allAddresses, remove}) => {
         }
     }, [selectedIndexes, group, allAddresses])
 
-    const isUpToDate = group.addresses === allAddresses.filter((a, i) => selectedIndexes.includes(i));
     const applySelected = useCallback(() => {
         editGroup({...group, addresses: allAddresses.filter((a, i) => selectedIndexes.includes(i))})
     }, [editGroup, group, allAddresses, selectedIndexes]);
@@ -30,6 +29,8 @@ const AddressListCard = ({n, group, editGroup, allAddresses, remove}) => {
         if (!editingName && name !== group.name) editName(name);
     }, [editName, editingName, name])
 
+    const selectedAddresses = allAddresses.filter((a, i) => selectedIndexes.includes(i));
+    const isUpToDate = !selectedIndexes.length || selectedAddresses.length === group.addresses.length && selectedAddresses.every((a, i) => a === group.addresses[i]);
     return (
         <Card>
             <CardHeader icon={faList} color={"amber"} label={
diff --git a/Plan/react/dashboard/src/components/cards/server/graphs/JoinAddressGraphCard.jsx b/Plan/react/dashboard/src/components/cards/server/graphs/JoinAddressGraphCard.jsx
index 73fc80255..f105005b0 100644
--- a/Plan/react/dashboard/src/components/cards/server/graphs/JoinAddressGraphCard.jsx
+++ b/Plan/react/dashboard/src/components/cards/server/graphs/JoinAddressGraphCard.jsx
@@ -26,7 +26,7 @@ const JoinAddressGraphCard = ({identifier}) => {
 
         let colors = ['#4ab4de'];
         const dataByGroup = [];
-        for (const group of list) {
+        for (const group of list.filter(group => group.addresses.length)) {
             const {data, error} = await fetchJoinAddressByDay(updateRequested, group.addresses, identifier);
             if (error) {
                 setLoadingError(error);