diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss
index 53a337ba0327..2f56374d6bed 100644
--- a/scss/mixins/_buttons.scss
+++ b/scss/mixins/_buttons.scss
@@ -31,7 +31,7 @@
     @include gradient-bg($hover-background);
     border-color: $hover-border;
     // Avoid using mixin so we can pass custom focus shadow properly
-    @if $enable-shadows {
+    @if $enable-shadows and $btn-box-shadow != none {
       box-shadow: $btn-box-shadow, 0 0 0 $btn-focus-width rgba(mix($color, $border, 15%), .5);
     } @else {
       box-shadow: 0 0 0 $btn-focus-width rgba(mix($color, $border, 15%), .5);