diff --git a/src/components/forms/sponsor-general-form/badge-scan-settings.js b/src/components/forms/sponsor-general-form/badge-scan-settings.js
index f9c6e41ad..ef00c54f9 100644
--- a/src/components/forms/sponsor-general-form/badge-scan-settings.js
+++ b/src/components/forms/sponsor-general-form/badge-scan-settings.js
@@ -40,8 +40,11 @@ const BadgeScanSettings = ({
 
   const selectedCount =
     currentSettings && currentSettings.columns
-      ? renderOptions(denormalizeLeadReportSettings(currentSettings.columns))
-          .length
+      ? renderOptions(
+          denormalizeLeadReportSettings(currentSettings.columns)
+        ).filter((option) =>
+          availableLeadReportColumns.some((col) => col.value === option.value)
+        ).length
       : 0;
 
   const handleUpsertSettings = (newValues) => {
diff --git a/src/components/mui/chip-select-input.js b/src/components/mui/chip-select-input.js
index 691d34d6f..75c0dfc52 100644
--- a/src/components/mui/chip-select-input.js
+++ b/src/components/mui/chip-select-input.js
@@ -86,7 +86,8 @@ const ChipSelectInput = ({
           renderValue={(selected) => (
             <Box sx={{ display: "flex", flexWrap: "wrap", gap: 0.5 }}>
               {selected.map((value) => {
-                const op = availableOptions.find((op) => op.value === value);
+                const op = availableOptions.find((opt) => opt.value === value);
+                if (!op) return null;
                 return (
                   <Chip
                     key={op.value}