diff --git a/packages/bbui/src/Form/Core/CheckboxGroup.svelte b/packages/bbui/src/Form/Core/CheckboxGroup.svelte
index d1a107fcc5..5aca7911e8 100644
--- a/packages/bbui/src/Form/Core/CheckboxGroup.svelte
+++ b/packages/bbui/src/Form/Core/CheckboxGroup.svelte
@@ -13,9 +13,8 @@
 
   const dispatch = createEventDispatcher()
 
-  const onChange = e => {
-    const optionValue = e.target.value
-    if (e.target.checked && !value.includes(optionValue)) {
+  const onChange = optionValue => {
+    if (!value.includes(optionValue)) {
       dispatch("change", [...value, optionValue])
     } else {
       dispatch(
@@ -39,10 +38,9 @@
           class="spectrum-Checkbox spectrum-Checkbox--sizeM spectrum-FieldGroup-item"
         >
           <input
-            on:change={onChange}
+            on:change={() => onChange(optionValue)}
             type="checkbox"
             class="spectrum-Checkbox-input"
-            value={optionValue}
             checked={value.includes(optionValue)}
             {disabled}
           />