diff --git a/apps/frontend/src/composables/fetch.js b/apps/frontend/src/composables/fetch.js
index 4b523176e..11167af4e 100644
--- a/apps/frontend/src/composables/fetch.js
+++ b/apps/frontend/src/composables/fetch.js
@@ -55,5 +55,8 @@ export const useBaseFetch = async (url, options = {}, skipAuth = false) => {
 		delete options.apiVersion
 	}
 
-	return await $fetch(`${base}${url}`, options)
+	return await $fetch(`${base}${url}`, {
+		timeout: import.meta.server ? 10000 : undefined,
+		...options,
+	})
 }