2 files changed, 2 insertions, 2 deletions
diff --git a/src/routes/api/badges/+server.ts b/src/routes/api/badges/+server.ts
index 5ce2bd86..0b72e348 100644
--- a/src/routes/api/badges/+server.ts
+++ b/src/routes/api/badges/+server.ts
@@ -114,7 +114,7 @@ export const PUT = async ({ cookies, url, request }) => {
 
     await setShadowHiddenBadge(Number(url.searchParams.get("id")), Number(url.searchParams.get("shadowHideBadge")), url.searchParams.get("status") == "true" ? false : true);
 
-    return await badges(identity.id);
+    return await badges(Number(url.searchParams.get("id")));
   }
 
   const badge = {
diff --git a/src/routes/user/[user]/badges/+page.svelte b/src/routes/user/[user]/badges/+page.svelte
index b47e572f..97e4999c 100644
--- a/src/routes/user/[user]/badges/+page.svelte
+++ b/src/routes/user/[user]/badges/+page.svelte
@@ -438,7 +438,7 @@
 		const currentBadge = selectedBadge?.index;
 		const categoryBadges = groupBadges(badges)[currentCategory];
 
-		if (!currentCategory || currentBadge === undefined) return;
+		if (!currentCategory || currentBadge === undefined || !categoryBadges) return;
 
 		let previousBadge = categoryBadges[currentBadge + direction];