diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4663dff5b..9c71fa716 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,6 @@
 
 ## 87.0.0-SNAPSHOT - unreleased
 
-
 ### 🎁 New Features
 
 * `CodeInput` / `JsonInput` now auto-format content for display via their configured `formatter`,
@@ -27,6 +26,7 @@
   focused and committed (full-precision) value.
 * Fixed inline grid editing not ending when clicking empty grid space to the right of the last
   column or below the last row - such clicks now commit the active edit.
+* `CheckboxButton` no longer leaks `HoistInputProps` into underlying HTML `<button>` element.
 
 ### ⚙️ Typescript API Adjustments
 
diff --git a/desktop/cmp/input/CheckboxButton.ts b/desktop/cmp/input/CheckboxButton.ts
index 8180564e4..6f577ce1d 100644
--- a/desktop/cmp/input/CheckboxButton.ts
+++ b/desktop/cmp/input/CheckboxButton.ts
@@ -47,7 +47,27 @@ class CheckboxButtonInputModel extends HoistInputModel {
 // Implementation
 //----------------------------------
 const cmp = hoistCmp.factory<CheckboxButtonInputModel>(
-    ({model, text, icon, rightIcon, checkedIcon, uncheckedIcon, iconSide, ...props}, ref) => {
+    (
+        {
+            // HoistInput props - exclude from passthrough to BP
+            bind,
+            value,
+            commitOnChange,
+            onChange,
+            onCommit,
+            // Consumed by this component
+            model,
+            text,
+            icon,
+            rightIcon,
+            checkedIcon,
+            uncheckedIcon,
+            iconSide,
+            // Remainder passed to hoist button & BP button
+            ...props
+        },
+        ref
+    ) => {
         const checked = !!model.renderValue,
             toggleIcon = checked
                 ? withDefault(checkedIcon, Icon.checkSquare({prefix: 'fas', intent: 'primary'}))
diff --git a/mobile/cmp/input/CheckboxButton.ts b/mobile/cmp/input/CheckboxButton.ts
index bb8591b69..04e2c7a0f 100644
--- a/mobile/cmp/input/CheckboxButton.ts
+++ b/mobile/cmp/input/CheckboxButton.ts
@@ -44,7 +44,24 @@ class CheckboxButtonInputModel extends HoistInputModel {
 // Implementation
 //----------------------------------
 const cmp = hoistCmp.factory<CheckboxButtonInputModel>(
-    ({model, text, checkedIcon, uncheckedIcon, ...props}, ref) => {
+    (
+        {
+            // HoistInput props - exclude from passthrough to Onsen
+            bind,
+            value,
+            commitOnChange,
+            onChange,
+            onCommit,
+            // Consumed by this component
+            model,
+            text,
+            checkedIcon,
+            uncheckedIcon,
+            // Remainder passed to hoist button & Onsen button
+            ...props
+        },
+        ref
+    ) => {
         const checked = !!model.renderValue;
         return button({
             text: withDefault(text, model.getField()?.displayName),