diff --git a/scss/_badge.scss b/scss/_badge.scss
index b87a1b004..2e489a05b 100644
--- a/scss/_badge.scss
+++ b/scss/_badge.scss
@@ -14,6 +14,12 @@
   vertical-align: baseline;
   @include border-radius($badge-border-radius);
 
+  &[href] {
+    @include hover-focus {
+      text-decoration: none;
+    }
+  }
+
   // Empty badges collapse automatically
   &:empty {
     display: none;
diff --git a/scss/mixins/_badge.scss b/scss/mixins/_badge.scss
index eeca0b40d..535bcb4cc 100644
--- a/scss/mixins/_badge.scss
+++ b/scss/mixins/_badge.scss
@@ -5,7 +5,6 @@
   &[href] {
     @include hover-focus {
       color: color-yiq($bg);
-      text-decoration: none;
       background-color: darken($bg, 10%);
     }
   }