diff --git a/src/components/Button/Button.tsx b/src/components/Button/Button.tsx
index 34558f8..9282a48 100644
--- a/src/components/Button/Button.tsx
+++ b/src/components/Button/Button.tsx
@@ -33,14 +33,14 @@ export default (props: Props) => {
       <Show when={props.to}>
         <Switch>
           <Match when={props.design}>
-            <A href={props.to!} aria-label={props.label} target={props.newtab ? '_blank' : '_self'}>
+            <A href={props.to!} aria-label={props.label} target={props.newtab ? '_blank' : ''}>
               <button class={props.design} style={borderRadius}>
                 {props.label || 'Click Me!'}
               </button>
             </A>
           </Match>
           <Match when={!props.design}>
-            <A href={props.to!} aria-label={props.label} target={props.newtab ? '_blank' : '_self'}>
+            <A href={props.to!} aria-label={props.label} target={props.newtab ? '_blank' : ''}>
               <button class="button" style={borderRadius}>
                 {props.label || 'Click Me!'}
               </button>
diff --git a/src/components/Link/Link.tsx b/src/components/Link/Link.tsx
index e5d4098..e191f7a 100644
--- a/src/components/Link/Link.tsx
+++ b/src/components/Link/Link.tsx
@@ -10,7 +10,7 @@ interface Props {
 export default (props: Props) => {
   return (
     <>
-      <A href={props.to} aria-label={`Go to ${props.to}`} target={props.newtab ? '_blank' : '_self'} data-astro-prefetch>
+      <A href={props.to} aria-label={`Go to ${props.to}`} target={props.newtab ? '_blank' : ''}>
         {props.children}
       </A>
     </>