diff --git a/components/lib/button/BaseButton.vue b/components/lib/button/BaseButton.vue
index 755de0fd5..8bcdc9742 100644
--- a/components/lib/button/BaseButton.vue
+++ b/components/lib/button/BaseButton.vue
@@ -79,7 +79,7 @@ const classes = {
         {
             'p-button-icon-only': instance.hasIcon && !props.label,
             'p-button-vertical': (props.iconPos === 'top' || props.iconPos === 'bottom') && props.label,
-            'p-disabled': instance.$attrs.disabled || props.loading,
+            'p-disabled': instance.$attrs.disabled || instance.$attrs.disabled === '' || props.loading,
             'p-button-loading': props.loading,
             'p-button-loading-label-only': props.loading && !instance.hasIcon && props.label,
             'p-button-link': props.link,
diff --git a/components/lib/button/Button.vue b/components/lib/button/Button.vue
index 1faf32530..30f7ac19d 100755
--- a/components/lib/button/Button.vue
+++ b/components/lib/button/Button.vue
@@ -24,7 +24,7 @@ export default {
     extends: BaseButton,
     computed: {
         disabled() {
-            return this.$attrs.disabled || this.loading;
+            return this.$attrs.disabled || this.$attrs.disabled === '' || this.loading;
         },
         defaultAriaLabel() {
             return this.label ? this.label + (this.badge ? ' ' + this.badge : '') : this.$attrs['aria-label'];