diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index bf7814865e..218a2782d3 100644
--- a/scss/_buttons.scss
+++ b/scss/_buttons.scss
@@ -10,6 +10,7 @@
   font-weight: $btn-font-weight;
   color: $body-color;
   text-align: center;
+  text-decoration: if($link-decoration == none, null, none);
   white-space: $btn-white-space;
   vertical-align: middle;
   user-select: none;
diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index bf458ecf74..2ab7536e13 100644
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -128,6 +128,7 @@
   font-weight: $font-weight-normal;
   color: $dropdown-link-color;
   text-align: inherit; // For `<button>`s
+  text-decoration: if($link-decoration == none, null, none);
   white-space: nowrap; // prevent links from randomly breaking onto new lines
   background-color: transparent; // For `<button>`s
   border: 0; // For `<button>`s
diff --git a/scss/_list-group.scss b/scss/_list-group.scss
index 468c2e31ac..2af8af23b9 100644
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@ -46,6 +46,7 @@
   display: block;
   padding: $list-group-item-padding-y $list-group-item-padding-x;
   color: $list-group-color;
+  text-decoration: if($link-decoration == none, null, none);
   background-color: $list-group-bg;
   border: $list-group-border-width solid $list-group-border-color;
 
diff --git a/scss/_nav.scss b/scss/_nav.scss
index 667d682721..b8b73bb7ab 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -14,6 +14,7 @@
 .nav-link {
   display: block;
   padding: $nav-link-padding-y $nav-link-padding-x;
+  text-decoration: if($link-decoration == none, null, none);
 
   @include hover-focus() {
     text-decoration: none;
diff --git a/scss/_pagination.scss b/scss/_pagination.scss
index 953a35a7fe..d7d553ccad 100644
--- a/scss/_pagination.scss
+++ b/scss/_pagination.scss
@@ -11,6 +11,7 @@
   margin-left: -$pagination-border-width;
   line-height: $pagination-line-height;
   color: $pagination-color;
+  text-decoration: if($link-decoration == none, null, none);
   background-color: $pagination-bg;
   border: $pagination-border-width solid $pagination-border-color;