diff --git a/server/api/admin/album.delete.ts b/server/api/admin/album.delete.ts
index f83083c..92e70f1 100644
--- a/server/api/admin/album.delete.ts
+++ b/server/api/admin/album.delete.ts
@@ -1,11 +1,11 @@
 import { getQuery, setResponseStatus } from "h3"
 import { Album } from "../../models/album"
 import { Track } from "../../models/track"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { parseMongoId, validationResponse } from "../../utils/api-validation"
 import { tryCleanUploadFileOrDirectory } from "../../utils/upload-files"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event, true)
 	const query = getQuery(event)
 	const parsedId = parseMongoId(query.id)
diff --git a/server/api/admin/album.patch.ts b/server/api/admin/album.patch.ts
index 1ad4c91..37c2256 100644
--- a/server/api/admin/album.patch.ts
+++ b/server/api/admin/album.patch.ts
@@ -2,11 +2,11 @@ import { getQuery, setResponseStatus } from "h3"
 import mongoose from "mongoose"
 import { readAdminForm, adminFormText, adminFormTexts, adminFormFile, safeFileExtension, splitIds } from "../../utils/admin-form"
 import { saveUploadFile, tryCleanUploadFileOrDirectory } from "../../utils/upload-files"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { parseMongoId, validationResponse } from "../../utils/api-validation"
 import { Album } from "../../models/album"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event, true)
 	const parsedId = parseMongoId(getQuery(event).id)
 	if ("error" in parsedId) return validationResponse(event, parsedId.error)
diff --git a/server/api/admin/album.post.ts b/server/api/admin/album.post.ts
index 9232739..5aaa0ce 100644
--- a/server/api/admin/album.post.ts
+++ b/server/api/admin/album.post.ts
@@ -1,10 +1,10 @@
 import { readAdminForm, adminFormText, adminFormTexts, adminFormFile, safeFileExtension, splitIds } from "../../utils/admin-form"
 import { saveUploadFile } from "../../utils/upload-files"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { Album } from "../../models/album"
 import mongoose from "mongoose"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event, true)
 	const parts = await readAdminForm(event)
 	const name = adminFormText(parts, "name")
diff --git a/server/api/admin/artist.delete.ts b/server/api/admin/artist.delete.ts
index f7f807b..152da68 100644
--- a/server/api/admin/artist.delete.ts
+++ b/server/api/admin/artist.delete.ts
@@ -2,7 +2,7 @@ import { getQuery, setResponseStatus } from "h3"
 import { Album } from "../../models/album"
 import { Artist } from "../../models/artist"
 import { Track } from "../../models/track"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { parseMongoId, validationResponse } from "../../utils/api-validation"
 import { tryCleanUploadFileOrDirectory } from "../../utils/upload-files"
 
@@ -10,7 +10,7 @@ async function findDependents(model: typeof Track | typeof Album, field: string,
 	return model.find({ [field]: value }).select("_id name").exec()
 }
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event, true)
 	const query = getQuery(event)
 	const parsedId = parseMongoId(query.id)
diff --git a/server/api/admin/artist.patch.ts b/server/api/admin/artist.patch.ts
index 072980e..0532e8e 100644
--- a/server/api/admin/artist.patch.ts
+++ b/server/api/admin/artist.patch.ts
@@ -2,11 +2,11 @@ import { getQuery, setResponseStatus } from "h3"
 import mongoose from "mongoose"
 import { readAdminForm, adminFormText, adminFormFile, safeFileExtension } from "../../utils/admin-form"
 import { saveUploadFile, tryCleanUploadFileOrDirectory } from "../../utils/upload-files"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { parseMongoId, validationResponse } from "../../utils/api-validation"
 import { Artist } from "../../models/artist"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event, true)
 	const parsedId = parseMongoId(getQuery(event).id)
 	if ("error" in parsedId) return validationResponse(event, parsedId.error)
diff --git a/server/api/admin/artist.post.ts b/server/api/admin/artist.post.ts
index e4ad3a5..64fd019 100644
--- a/server/api/admin/artist.post.ts
+++ b/server/api/admin/artist.post.ts
@@ -1,9 +1,9 @@
 import { readAdminForm, adminFormText, adminFormFile, safeFileExtension } from "../../utils/admin-form"
 import { saveUploadFile } from "../../utils/upload-files"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { Artist } from "../../models/artist"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event, true)
 	const parts = await readAdminForm(event)
 	const name = adminFormText(parts, "name")
diff --git a/server/api/admin/genre.delete.ts b/server/api/admin/genre.delete.ts
index 44629c8..921fa15 100644
--- a/server/api/admin/genre.delete.ts
+++ b/server/api/admin/genre.delete.ts
@@ -1,10 +1,10 @@
 import { getQuery, setResponseStatus } from "h3"
 import { Album } from "../../models/album"
 import { Genre } from "../../models/genre"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { parseMongoId } from "../../utils/api-validation"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event, true)
 
 	const query = getQuery(event)
diff --git a/server/api/admin/genre.patch.ts b/server/api/admin/genre.patch.ts
index 1246759..5075ba0 100644
--- a/server/api/admin/genre.patch.ts
+++ b/server/api/admin/genre.patch.ts
@@ -1,9 +1,9 @@
 import { getQuery, readBody, setResponseStatus } from "h3"
 import { Genre } from "../../models/genre"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { parseMongoId } from "../../utils/api-validation"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event, true)
 
 	const parsedId = parseMongoId(getQuery(event).id)
diff --git a/server/api/admin/genre.post.ts b/server/api/admin/genre.post.ts
index c095131..e519f38 100644
--- a/server/api/admin/genre.post.ts
+++ b/server/api/admin/genre.post.ts
@@ -1,8 +1,8 @@
 import { readBody, setResponseStatus } from "h3"
 import { Genre } from "../../models/genre"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event, true)
 
 	const body = await readBody<unknown>(event)
diff --git a/server/api/admin/track.delete.ts b/server/api/admin/track.delete.ts
index 14fe65d..76dfa98 100644
--- a/server/api/admin/track.delete.ts
+++ b/server/api/admin/track.delete.ts
@@ -1,10 +1,10 @@
 import { getQuery, setResponseStatus } from "h3"
 import { Track } from "../../models/track"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { parseMongoId, validationResponse } from "../../utils/api-validation"
 import { tryCleanUploadFileOrDirectory } from "../../utils/upload-files"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event, true)
 	const parsedId = parseMongoId(getQuery(event).id)
 	if ("error" in parsedId) return validationResponse(event, parsedId.error)
diff --git a/server/api/admin/track.patch.ts b/server/api/admin/track.patch.ts
index b1eec75..80bea53 100644
--- a/server/api/admin/track.patch.ts
+++ b/server/api/admin/track.patch.ts
@@ -4,11 +4,11 @@ import { getQuery } from "h3"
 import { readAdminForm, adminFormText, adminFormTexts, adminFormFile, safeFileExtension, parseOptionalJson, splitIds } from "../../utils/admin-form"
 import { saveUploadFile, tryCleanUploadFileOrDirectory } from "../../utils/upload-files"
 import { getAudioDuration, processAudioFile } from "../../utils/audio-files"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { parseMongoId, validationResponse } from "../../utils/api-validation"
 import { Track } from "../../models/track"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event, true)
 	const parsedId = parseMongoId(getQuery(event).id)
 	if ("error" in parsedId) return validationResponse(event, parsedId.error)
diff --git a/server/api/admin/track.post.ts b/server/api/admin/track.post.ts
index 70bcd41..7650c1d 100644
--- a/server/api/admin/track.post.ts
+++ b/server/api/admin/track.post.ts
@@ -3,10 +3,10 @@ import mongoose from "mongoose"
 import { readAdminForm, adminFormText, adminFormTexts, adminFormFile, parseOptionalJson, splitIds } from "../../utils/admin-form"
 import { saveUploadFile, tryCleanUploadFileOrDirectory } from "../../utils/upload-files"
 import { getAudioDuration, processAudioFile } from "../../utils/audio-files"
-import { requireAuthenticatedUser } from "../../utils/auth"
+import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { Track } from "../../models/track"
 
-export default defineEventHandler(async (event) => {
+export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event, true)
 	const parts = await readAdminForm(event)
 	const name = adminFormText(parts, "name")
@@ -59,6 +59,6 @@ export default defineEventHandler(async (event) => {
 		void tryCleanUploadFileOrDirectory(event, fileDirectory)
 		console.log(error)
 		setResponseStatus(event, 500)
-		return null
+		return undefined
 	}
 })