diff --git a/front/src/components/library/Albums.vue b/front/src/components/library/Albums.vue
index cc373f1b2..85a365614 100644
--- a/front/src/components/library/Albums.vue
+++ b/front/src/components/library/Albums.vue
@@ -55,7 +55,7 @@ const tagList = computed(() => ({
 }))
 
 const q = useRouteQuery('query', '')
-const query = ref(q.value)
+const query = ref(q.value ?? '')
 syncRef(q, query, { direction: 'ltr' })
 
 const result = ref<PaginatedAlbumList>()
diff --git a/front/src/components/ui/Pagination.vue b/front/src/components/ui/Pagination.vue
index 788fcfe56..fb9a59597 100644
--- a/front/src/components/ui/Pagination.vue
+++ b/front/src/components/ui/Pagination.vue
@@ -20,7 +20,7 @@ const page = defineModel<number>('page', {
   validator: (value: number) => value > 0
 })
 
-const goTo = ref<number>()
+const goTo = ref<number>(1)
 
 const range = (start: number, end: number) => Array.from({ length: end - start + 1 }, (_, i) => i + start)
 
@@ -105,10 +105,11 @@ const setPage = () => {
       </li>
     </ul>
 
+<!-- TODO: Move number input functionality into `Input` component -->
     <div class="goto">
       {{ t('vui.go-to') }}
       <Input :placeholder="page.toString()" @keyup.enter="setPage" @keydown="preventNonNumeric"
-        inputmode="numeric" pattern="[0-9]* // TODO: Move number input functionality into `Input` component"
+        inputmode="numeric" pattern="[0-9]*"
         v-model="goTo" />
     </div>
   </nav>