diff --git a/src/components/Breadcrumb/BreadcrumbItem.svelte b/src/components/Breadcrumb/BreadcrumbItem.svelte
index b3c35594..8835c973 100644
--- a/src/components/Breadcrumb/BreadcrumbItem.svelte
+++ b/src/components/Breadcrumb/BreadcrumbItem.svelte
@@ -15,17 +15,16 @@
     isCurrentPage && ariaCurrent !== 'page' && '--breadcrumb-item--current',
     className
   );
-  $: itemProps = { 'aria-current': ariaCurrent, class: cx('--link') };
 </script>
 
 {#if href}
   <li class={_class} {...props}>
-    <Link {href} props={itemProps}>
+    <Link {href} aria-current={ariaCurrent}>
       <slot />
     </Link>
   </li>
 {:else}
   <li class={_class} {...props}>
-    <slot props={itemProps} />
+    <slot props={{ 'aria-current': ariaCurrent, class: cx('--link') }} />
   </li>
 {/if}
diff --git a/src/components/Link/Link.svelte b/src/components/Link/Link.svelte
index 6bdcb9aa..d7e98ad5 100644
--- a/src/components/Link/Link.svelte
+++ b/src/components/Link/Link.svelte
@@ -17,11 +17,26 @@
 </script>
 
 {#if disabled}
-  <p on:click on:mouseover on:mouseenter on:mouseleave {style} class={_class}>
+  <p
+    on:click
+    on:mouseover
+    on:mouseenter
+    on:mouseleave
+    {style}
+    aria-current={$$props['aria-current']}
+    class={_class}>
     <slot />
   </p>
 {:else}
-  <a on:click on:mouseover on:mouseenter on:mouseleave {style} class={_class} {href}>
+  <a
+    on:click
+    on:mouseover
+    on:mouseenter
+    on:mouseleave
+    {style}
+    aria-current={$$props['aria-current']}
+    class={_class}
+    {href}>
     <slot />
   </a>
 {/if}