diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index 701c097cf3..1b27a7d34f 100644
--- a/scss/_buttons.scss
+++ b/scss/_buttons.scss
@@ -21,7 +21,7 @@
 
   &:hover {
     color: $body-color;
-    text-decoration: none;
+    text-decoration: if($link-hover-decoration == underline, none, null);
   }
 
   &:focus,
diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index 48cceed40f..3290f22cbb 100644
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -150,7 +150,7 @@
   &:hover,
   &:focus {
     color: $dropdown-link-hover-color;
-    text-decoration: none;
+    text-decoration: if($link-hover-decoration == underline, none, null);
     @include gradient-bg($dropdown-link-hover-bg);
   }
 
diff --git a/scss/_nav.scss b/scss/_nav.scss
index 62013cdada..81eec4ed3f 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -18,7 +18,7 @@
 
   &:hover,
   &:focus {
-    text-decoration: none;
+    text-decoration: if($link-hover-decoration == underline, none, null);
   }
 
   // Disabled state lightens text
diff --git a/scss/_pagination.scss b/scss/_pagination.scss
index 9d728aad32..3ef747d311 100644
--- a/scss/_pagination.scss
+++ b/scss/_pagination.scss
@@ -14,7 +14,7 @@
   &:hover {
     z-index: 2;
     color: $pagination-hover-color;
-    text-decoration: none;
+    text-decoration: if($link-hover-decoration == underline, none, null);
     background-color: $pagination-hover-bg;
     border-color: $pagination-hover-border-color;
   }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 916b420975..39b9f5d229 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -251,7 +251,7 @@ $body-text-align:           null !default;
 $link-color:                              $primary !default;
 $link-decoration:                         underline !default;
 $link-hover-color:                        darken($link-color, 15%) !default;
-$link-hover-decoration:                   $link-decoration !default;
+$link-hover-decoration:                   null !default;
 // Darken percentage for links with `.text-*` class (e.g. `.text-success`)
 $emphasized-link-hover-darken-percentage: 15% !default;
 
diff --git a/site/assets/scss/_sidebar.scss b/site/assets/scss/_sidebar.scss
index e781194713..4348615d62 100644
--- a/site/assets/scss/_sidebar.scss
+++ b/site/assets/scss/_sidebar.scss
@@ -70,7 +70,6 @@
     &:hover,
     &:focus {
       color: rgba($black, .85);
-      text-decoration: none;
       background-color: rgba($bd-purple-bright, .1);
     }
   }