diff --git a/scss/_badge.scss b/scss/_badge.scss
index 5f1695e7ae..cc3d269556 100644
--- a/scss/_badge.scss
+++ b/scss/_badge.scss
@@ -22,7 +22,7 @@
   text-align: center;
   white-space: nowrap;
   vertical-align: baseline;
-  border-radius: var(--#{$prefix}badge-border-radius, 0); // stylelint-disable-line property-disallowed-list
+  @include border-radius(var(--#{$prefix}badge-border-radius));
   @include gradient-bg();
 
   // Empty badges collapse automatically
diff --git a/scss/_tooltip.scss b/scss/_tooltip.scss
index df8cdc58b7..7da3df3e00 100644
--- a/scss/_tooltip.scss
+++ b/scss/_tooltip.scss
@@ -116,5 +116,5 @@
   color: var(--#{$prefix}tooltip-color);
   text-align: center;
   background-color: var(--#{$prefix}tooltip-bg);
-  border-radius: var(--#{$prefix}tooltip-border-radius, 0); // stylelint-disable-line property-disallowed-list
+  @include border-radius(var(--#{$prefix}tooltip-border-radius));
 }