diff --git a/docs/nodes/widgets/ui-button-group.md b/docs/nodes/widgets/ui-button-group.md
index feaf3ddba..7385a98e3 100644
--- a/docs/nodes/widgets/ui-button-group.md
+++ b/docs/nodes/widgets/ui-button-group.md
@@ -18,6 +18,9 @@ controls:
         example: true | false
         description: Allow control over whether or not the button is clickable.
 dynamic:
+    Disabled State:
+        payload: msg.enabled
+        structure: ["Boolean"]
     Label:
         payload: msg.ui_update.label
         structure: ["String"]
diff --git a/nodes/widgets/locales/en-US/ui_button_group.html b/nodes/widgets/locales/en-US/ui_button_group.html
index 25e244b0b..f5c3e592b 100644
--- a/nodes/widgets/locales/en-US/ui_button_group.html
+++ b/nodes/widgets/locales/en-US/ui_button_group.html
@@ -2,6 +2,7 @@
 <script type="text/html" data-help-name="ui-button-group">
     <p>A Node-RED node to show a switch with multiple buttons in the Node-RED Dashboard.</p>
     <p>The active selection can be dynamically set by sending a <code>msg.payload</code> which matches a respective option's value.</p>
+    <p>To clear any selection, pass an empty array <code>[]</code> as <code>msg.payload</code>.</p>
     <h3>Properties</h3>
     <p><strong>Label:</strong><br/>
     The label that will be displayed on the left side of the button group.</p>
diff --git a/nodes/widgets/ui_button_group.js b/nodes/widgets/ui_button_group.js
index ff5d9e725..ad3849719 100644
--- a/nodes/widgets/ui_button_group.js
+++ b/nodes/widgets/ui_button_group.js
@@ -14,7 +14,6 @@ module.exports = function (RED) {
             beforeSend: function (msg) {
                 if (msg.ui_update) {
                     const update = msg.ui_update
-                    console.log(update)
                     if (typeof update.options !== 'undefined') {
                         // dynamically set "options" property
                         statestore.set(group.getBase(), node, msg, 'options', update.options)
diff --git a/ui/src/widgets/ui-button-group/UIButtonGroup.vue b/ui/src/widgets/ui-button-group/UIButtonGroup.vue
index 5b966a8f6..3121e5ac2 100644
--- a/ui/src/widgets/ui-button-group/UIButtonGroup.vue
+++ b/ui/src/widgets/ui-button-group/UIButtonGroup.vue
@@ -3,7 +3,7 @@
         <label v-if="label" class="v-label">
             {{ label }}
         </label>
-        <v-btn-toggle v-model="selection" mandatory divided :rounded="props.rounded ? 'xl' : ''" :color="selectedColor" @update:model-value="onChange(selection)">
+        <v-btn-toggle v-model="selection" mandatory divided :rounded="props.rounded ? 'xl' : ''" :color="selectedColor" :disabled="!state.enabled" @update:model-value="onChange(selection)">
             <v-btn v-for="option in options" :key="option.value" :value="option.value">
                 <template v-if="option.icon && option.label !== undefined && option.label !== ''" #prepend>
                     <v-icon size="x-large" :icon="`mdi-${option.icon.replace(/^mdi-/, '')}`" />
@@ -80,8 +80,17 @@ export default {
                 widgetId: this.id,
                 msg
             })
+
             // make sure our v-model is updated to reflect the value from Node-RED
-            this.selection = msg.payload
+            if (msg.payload !== undefined) {
+                if (Array.isArray(msg.payload) && msg.payload.length === 0) {
+                    this.selection = null
+                } else {
+                    if (this.findOptionByValue(msg.payload) !== null) {
+                        this.selection = msg.payload
+                    }
+                }
+            }
         },
         onLoad (msg) {
             // update vuex store to reflect server-state
@@ -90,7 +99,15 @@ export default {
                 msg
             })
             // make sure we've got the relevant option selected on load of the page
-            this.selection = msg.payload
+            if (msg.payload !== undefined) {
+                if (Array.isArray(msg.payload) && msg.payload.length === 0) {
+                    this.selection = null
+                } else {
+                    if (this.findOptionByValue(msg.payload) !== null) {
+                        this.selection = msg.payload
+                    }
+                }
+            }
         },
         onDynamicProperty (msg) {
             const updates = msg.ui_update
@@ -124,7 +141,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style>
 .nrdb-ui-button-group-wrapper {
     display: flex;
     flex-direction: row;
@@ -155,4 +172,12 @@ export default {
 .nrdb-ui-button-group-wrapper .icon-only .v-btn__prepend {
     margin-inline: 0;
 }
+
+.nrdb-ui-button-group-wrapper .v-btn.v-btn--disabled .v-btn__overlay {
+    opacity: 0.1;
+}
+
+.nrdb-ui-button-group-wrapper .v-btn-group .v-btn--disabled .v-btn__content {
+    color: rgb(var(--v-theme-on-group-background), var(--v-disabled-opacity));
+}
 </style>