diff --git a/components/nav/NavSideItem.vue b/components/nav/NavSideItem.vue
index 97ab525e..7eb5d3b4 100644
--- a/components/nav/NavSideItem.vue
+++ b/components/nav/NavSideItem.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import { warn } from 'vue'
-
 const props = withDefaults(defineProps<{
   text?: string
   icon: string
@@ -31,7 +29,7 @@ useCommand({
 })
 
 let activeClass = $ref('text-primary')
-watch(isMastoInitialised, async () => {
+onMastoInit(async () => {
   if (!props.userOnly) {
     // TODO: force NuxtLink to reevaluate, we now we are in this route though, so we should force it to active
     // we don't have currentServer defined until later
diff --git a/composables/masto.ts b/composables/masto.ts
index b4973a9a..c72ca4d7 100644
--- a/composables/masto.ts
+++ b/composables/masto.ts
@@ -7,6 +7,12 @@ export const useMasto = () => useNuxtApp().$masto as ElkMasto
 
 export const isMastoInitialised = computed(() => process.client && useMasto().loggedIn.value)
 
+export const onMastoInit = (cb: () => unknown) => {
+  watchOnce(isMastoInitialised, () => {
+    cb()
+  }, { immediate: isMastoInitialised.value })
+}
+
 // @unocss-include
 export const STATUS_VISIBILITIES = [
   {
diff --git a/composables/paginator.ts b/composables/paginator.ts
index 5c634ab1..5c9f5de1 100644
--- a/composables/paginator.ts
+++ b/composables/paginator.ts
@@ -86,7 +86,7 @@ export function usePaginator<T>(
     }, 1000)
 
     if (!isMastoInitialised.value) {
-      watchOnce(isMastoInitialised, () => {
+      onMastoInit(() => {
         state.value = 'idle'
         loadNext()
       })
diff --git a/middleware/auth.ts b/middleware/auth.ts
index c5a09ef6..e41dbd93 100644
--- a/middleware/auth.ts
+++ b/middleware/auth.ts
@@ -4,18 +4,10 @@ export default defineNuxtRouteMiddleware((to) => {
   if (to.path === '/signin/callback')
     return
 
-  if (!isMastoInitialised.value) {
-    watchOnce(isMastoInitialised, () => {
-      if (!currentUser.value)
-        return navigateTo(`/${currentServer.value}/public`)
-      if (to.path === '/')
-        return navigateTo('/home')
-    })
-    return
-  }
-
-  if (!currentUser.value)
-    return navigateTo(`/${currentServer.value}/public`)
-  if (to.path === '/')
-    return navigateTo('/home')
+  onMastoInit(() => {
+    if (!currentUser.value)
+      return navigateTo(`/${currentServer.value}/public`)
+    if (to.path === '/')
+      return navigateTo('/home')
+  })
 })
diff --git a/pages/settings/profile/appearance.vue b/pages/settings/profile/appearance.vue
index 6355138c..cd9049b2 100644
--- a/pages/settings/profile/appearance.vue
+++ b/pages/settings/profile/appearance.vue
@@ -45,10 +45,7 @@ const { form, reset, submitter, dirtyFields, isError } = useForm({
   },
 })
 
-watch(isMastoInitialised, async (val) => {
-  if (!val)
-    return
-
+onMastoInit(async () => {
   // Keep the information to be edited up to date
   await pullMyAccountInfo()
   reset()