diff --git a/Sources/Classes/Views/CustomizableButton/CustomizableButtonView.swift b/Sources/Classes/Views/CustomizableButton/CustomizableButtonView.swift
index bf7b5838..c2eb067b 100644
--- a/Sources/Classes/Views/CustomizableButton/CustomizableButtonView.swift
+++ b/Sources/Classes/Views/CustomizableButton/CustomizableButtonView.swift
@@ -136,8 +136,6 @@ open class CustomizableButtonView: UIView, InitializableView, ConfigurableView {
     }
 
     private func set(active: Bool) {
-        button.isEnabled = buttonIsDisabledWhileLoading || !active
-
         if hidesLabelWhenLoading {
             button.titleLabel?.layer.opacity = active ? 0 : 1
         }
@@ -260,7 +258,7 @@ open class CustomizableButtonView: UIView, InitializableView, ConfigurableView {
     }
 
     open func configureButton(withState state: CustomizableButtonState) {
-        button.isEnabled = state.contains(.enabled) && !state.contains(.disabled)
+        button.isEnabled = ![.disabled, .loading].contains(state)
         button.isHighlighted = state.contains(.highlighted) && !state.contains(.normal)
         set(active: state.contains(.loading))
     }