diff --git a/src/routes/choose.svelte b/src/routes/choose.svelte
index 7d84750..aa39e7b 100644
--- a/src/routes/choose.svelte
+++ b/src/routes/choose.svelte
@@ -23,12 +23,9 @@
     // Variables
     const { page } = stores()
 
-
-    // Reset current location if existing
-    $: {
-        if ($currentLocation) currentLocation.set()
-        if ($currentPhotos) currentPhotos.set()
-    }
+    // Reset current location
+    currentLocation.set()
+    currentPhotos.set()
 
 
     /*
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index e83f1aa..5f52c60 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -58,10 +58,8 @@
     const { page } = stores()
 
     // Reset current location if existing
-    $: {
-        if ($currentLocation) currentLocation.set()
-        if ($currentPhotos) currentPhotos.set()
-    }
+    currentLocation.set()
+    currentPhotos.set()
 
 
     /*