diff --git a/app/composables/useApiFetch.ts b/app/composables/useApiFetch.ts
index ffc0241..a19f902 100644
--- a/app/composables/useApiFetch.ts
+++ b/app/composables/useApiFetch.ts
@@ -4,7 +4,7 @@ import defu from "defu"
 export function useApiFetch<DataT = any, ErrorT = any>(
 	url: string | Request | Ref<string | Request> | (() => string | Request),
 	options?: UseFetchOptions<DataT, ErrorT>,
-	authorize: boolean = true
+	authorize: boolean = true,
 ): ReturnType<typeof useFetch<DataT, ErrorT>> {
 	const baseUrl = import.meta.env.VITE_PUBLIC_BACKEND
 
@@ -15,26 +15,25 @@ export function useApiFetch<DataT = any, ErrorT = any>(
 	const defaults: UseFetchOptions<DataT, ErrorT> = {
 		baseURL: baseUrl,
 
+		retry: 1,
+		retryDelay: 0,
+		retryStatusCodes: [401],
+
 		headers:
 			authorize && sessionToken.value
 				? { Authorization: `Bearer ${sessionToken.value}` }
 				: {},
-		onResponseError: async ({ response, options }) => {
+		onResponseError: async ({ request, response, options }) => {
 			if (response.status == 401 && authorize) {
 				const newToken = await refreshSessionToken()
 
 				if (!newToken) return
 
-				const newOptions = {
-					...options,
-					headers: {
-						...(options.headers || {}),
-						Authorization: `Bearer ${newToken}`,
-					},
+				options.headers = {
+					...(options.headers as unknown as Record<string, string>),
+					// @ts-ignore
+					Authorization: `Bearer ${newToken}`,
 				}
-
-				// @ts-ignore
-				return await $fetch<DataT, ErrorT>(url, newOptions)
 			}
 		},
 	}
diff --git a/app/pages/album/[id].vue b/app/pages/album/[id].vue
index e50cd4f..8bd2346 100644
--- a/app/pages/album/[id].vue
+++ b/app/pages/album/[id].vue
@@ -12,7 +12,7 @@ const { playAlbum, playShuffledAlbum, playAlbumAtIndex } = usePlayer()
 </script>
 
 <template>
-	<section class="info">
+	<section class="info" v-if="albumData">
 		<NuxtImg
 			:src="GET_FILE(albumData.file)"
 			width="300"
diff --git a/app/utils/cfetch.ts b/app/utils/cfetch.ts
index dc8dcd7..9291e83 100644
--- a/app/utils/cfetch.ts
+++ b/app/utils/cfetch.ts
@@ -62,13 +62,13 @@ export const cfetch = async (
 	let response
 	try {
 		response = await axios(url, config)
-	} catch {
-		if (response?.status == 401) {
+	} catch (error: any) {
+		if (error.response?.status == 401) {
 			if (!config.headers) config.headers = {}
 			config.headers.Authorization = `Bearer ${await refreshSessionToken()}`
 
 			response = await axios(url, config)
-		}
+		} else throw error
 	}
 
 	if (!response) throw new Error("Something went wrong. Please try again")