diff --git a/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift b/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift
index c4e18328..ee47cd1e 100644
--- a/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift
+++ b/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift
@@ -166,7 +166,7 @@ open class ButtonIcon: Control, Changeable, FormFieldable {
     open var inputId: String? { didSet { setNeedsUpdate() } }
 
     open var value: AnyHashable? { didSet { setNeedsUpdate() } }
-
+    
     //--------------------------------------------------
     // MARK: - Configuration
     //--------------------------------------------------
@@ -477,6 +477,7 @@ open class ButtonIcon: Control, Changeable, FormFieldable {
     //--------------------------------------------------
     private func updateBadgeIndicator() {
         if let badgeIndicatorModel {
+            badgeIndicator.isEnabled = isEnabled
             badgeIndicator.kind = badgeIndicatorModel.kind
             badgeIndicator.fillColor = badgeIndicatorModel.fillColor
             badgeIndicator.surface = badgeIndicatorModel.surface