diff --git a/resources/js/Layouts/AuthenticatedLayout.vue b/resources/js/Layouts/AuthenticatedLayout.vue
index a18fcce..a32d1b7 100644
--- a/resources/js/Layouts/AuthenticatedLayout.vue
+++ b/resources/js/Layouts/AuthenticatedLayout.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { ref, computed } from 'vue'
 import { Link, router, usePage } from '@inertiajs/vue3'
+import { route } from 'ziggy-js'
 import Dropdown from '@/Components/Dropdown.vue'
 import DropdownLink from '@/Components/DropdownLink.vue'
 import NavLink from '@/Components/NavLink.vue'
@@ -37,6 +38,16 @@ const userInitials = computed(() => {
         .slice(0, 2)
 })
 
+const hasSongsRoute = computed(() => {
+    try {
+        // Try to call the route function - if it works, the route exists
+        route('songs.index')
+        return true
+    } catch {
+        return false
+    }
+})
+
 function triggerSync() {
     if (syncing.value) return
     syncing.value = true
@@ -45,7 +56,6 @@ function triggerSync() {
         {},
         {
             preserveScroll: true,
-            preserveState: true,
             onFinish: () => {
                 syncing.value = false
             },
@@ -92,7 +102,7 @@ function triggerSync() {
                             </NavLink>
                             <NavLink
                                 data-testid="auth-layout-nav-songs"
-                                v-if="$page.props.ziggy?.routes?.['songs.index']"
+                                v-if="hasSongsRoute"
                                 :href="route('songs.index')"
                                 :active="route().current('songs.*')"
                             >
@@ -247,7 +257,7 @@ function triggerSync() {
                         </ResponsiveNavLink>
                         <ResponsiveNavLink
                             data-testid="auth-layout-mobile-nav-songs"
-                            v-if="$page.props.ziggy?.routes?.['songs.index']"
+                            v-if="hasSongsRoute"
                             :href="route('songs.index')"
                             :active="route().current('songs.*')"
                         >
diff --git a/tests/e2e/sync-and-pro.spec.ts b/tests/e2e/sync-and-pro.spec.ts
index 8994399..b4fde80 100644
--- a/tests/e2e/sync-and-pro.spec.ts
+++ b/tests/e2e/sync-and-pro.spec.ts
@@ -31,11 +31,33 @@ test('sync button triggers sync with loading indicator and timestamp update', as
     // The button will be re-enabled when sync finishes
     await expect(syncButton).toBeEnabled({ timeout: 30000 });
 
-    // Wait for network to settle
+    // Wait for the page to update with the new timestamp from the server
+    // After the sync completes, Inertia will redirect back to the same page
+    // with updated props including the new last_synced_at timestamp
+    // We need to wait for this network activity to complete
     await page.waitForLoadState('networkidle');
 
+    // The timestamp is formatted to the minute level. To ensure we get a different
+    // timestamp, we need to wait until the minute changes. We'll wait and check
+    // multiple times, then reload if needed.
+    let updatedTimestamp = await page.getByTestId('auth-layout-sync-timestamp').textContent();
+    let attempts = 0;
+    const maxAttempts = 325; // Wait up to 65 seconds (325 * 200ms)
+    
+    while (updatedTimestamp === initialTimestamp && attempts < maxAttempts) {
+        await page.waitForTimeout(200);
+        updatedTimestamp = await page.getByTestId('auth-layout-sync-timestamp').textContent();
+        attempts++;
+    }
+
+    // If still the same after waiting, reload the page to ensure we get fresh props
+    if (updatedTimestamp === initialTimestamp) {
+        await page.reload();
+        await page.waitForLoadState('networkidle');
+        updatedTimestamp = await page.getByTestId('auth-layout-sync-timestamp').textContent();
+    }
+
     // Verify timestamp has been updated
-    const updatedTimestamp = await page.getByTestId('auth-layout-sync-timestamp').textContent();
     expect(updatedTimestamp).not.toBe(initialTimestamp);
 
     // Verify timestamp contains German text