diff --git a/src/components/molecules/ShopLocationSwitcher.svelte b/src/components/molecules/ShopLocationSwitcher.svelte
index de72ad0..ee27cdf 100644
--- a/src/components/molecules/ShopLocationSwitcher.svelte
+++ b/src/components/molecules/ShopLocationSwitcher.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-    import { page } from '$app/stores'
     import { goto } from '$app/navigation'
     import { getContext } from 'svelte'
 
     export let isOver: boolean = false
+    export let currentProductSlug: string = undefined
 
     const { shopLocations } = getContext('shop')
 
@@ -29,7 +29,7 @@
         </svg>
         <select on:change={quickLocationChange}>
             {#each shopLocations as { name, slug }}
-                <option value={slug} selected={slug === $page.params.name}>{name}</option>
+                <option value={slug} selected={slug === currentProductSlug}>{name}</option>
             {/each}
         </select>
     </dd>
diff --git a/src/components/organisms/ShopHeader.svelte b/src/components/organisms/ShopHeader.svelte
index efcb228..2265edb 100644
--- a/src/components/organisms/ShopHeader.svelte
+++ b/src/components/organisms/ShopHeader.svelte
@@ -128,6 +128,6 @@
     class:is-visible={scrolledPastIntro}
     class:is-overlaid={$cartOpen}
 >
-    <ShopLocationSwitcher />
+    <ShopLocationSwitcher currentProductSlug={product && product.location.slug} />
     <ButtonCart />
 </nav>
\ No newline at end of file