diff --git a/api/api/v1/accounts/:id/roles/:role_id/index.ts b/api/api/v1/accounts/:id/roles/:role_id/index.ts
index 9ac7a682..e9a9e2df 100644
--- a/api/api/v1/accounts/:id/roles/:role_id/index.ts
+++ b/api/api/v1/accounts/:id/roles/:role_id/index.ts
@@ -146,7 +146,7 @@ export default apiRoute((app) => {
 
         await role.linkUser(targetUser.id);
 
-        return context.text("", 204);
+        return context.body(null, 204);
     });
 
     app.openapi(routeDelete, async (context) => {
@@ -186,6 +186,6 @@ export default apiRoute((app) => {
 
         await role.unlinkUser(targetUser.id);
 
-        return context.text("", 204);
+        return context.body(null, 204);
     });
 });
diff --git a/api/api/v1/emojis/:id/index.ts b/api/api/v1/emojis/:id/index.ts
index 10689971..c91a91cd 100644
--- a/api/api/v1/emojis/:id/index.ts
+++ b/api/api/v1/emojis/:id/index.ts
@@ -362,6 +362,6 @@ export default apiRoute((app) => {
 
         await db.delete(Emojis).where(eq(Emojis.id, id));
 
-        return context.text("", 204);
+        return context.body(null, 204);
     });
 });
diff --git a/api/api/v1/media/:id/index.ts b/api/api/v1/media/:id/index.ts
index f17f7492..1f6f6b99 100644
--- a/api/api/v1/media/:id/index.ts
+++ b/api/api/v1/media/:id/index.ts
@@ -52,7 +52,7 @@ const routePut = createRoute({
         },
     },
     responses: {
-        204: {
+        200: {
             description: "Media updated",
             content: {
                 "application/json": {
@@ -147,10 +147,10 @@ export default apiRoute((app) => {
                 thumbnailUrl,
             });
 
-            return context.json(attachment.toApi(), 204);
+            return context.json(attachment.toApi(), 200);
         }
 
-        return context.json(attachment.toApi(), 204);
+        return context.json(attachment.toApi(), 200);
     });
 
     app.openapi(routeGet, async (context) => {
diff --git a/api/api/v1/roles/:id/index.ts b/api/api/v1/roles/:id/index.ts
index a10fd802..2627f8ea 100644
--- a/api/api/v1/roles/:id/index.ts
+++ b/api/api/v1/roles/:id/index.ts
@@ -226,7 +226,7 @@ export default apiRoute((app) => {
             visible,
         });
 
-        return context.text("", 204);
+        return context.body(null, 204);
     });
 
     app.openapi(routeDelete, async (context) => {
@@ -261,6 +261,6 @@ export default apiRoute((app) => {
 
         await role.delete();
 
-        return context.text("", 204);
+        return context.body(null, 204);
     });
 });
diff --git a/api/api/v2/filters/:id/index.ts b/api/api/v2/filters/:id/index.ts
index ea6c3626..f39f418f 100644
--- a/api/api/v2/filters/:id/index.ts
+++ b/api/api/v2/filters/:id/index.ts
@@ -343,6 +343,6 @@ export default apiRoute((app) => {
             .delete(Filters)
             .where(and(eq(Filters.userId, user.id), eq(Filters.id, id)));
 
-        return context.text("", 204);
+        return context.body(null, 204);
     });
 });
diff --git a/api/media/proxy/:id.ts b/api/media/proxy/:id.ts
index a3e4ba93..9158cb58 100644
--- a/api/media/proxy/:id.ts
+++ b/api/media/proxy/:id.ts
@@ -1,6 +1,6 @@
 import { apiRoute, applyConfig } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
-import type { StatusCode } from "hono/utils/http-status";
+import type { ContentfulStatusCode, StatusCode } from "hono/utils/http-status";
 import { z } from "zod";
 import { config } from "~/packages/config-manager";
 import { ErrorSchema } from "~/types/api";
@@ -85,7 +85,11 @@ export default apiRoute((app) =>
                 .get("Content-Disposition")
                 ?.match(/filename="(.+)"/)?.[1] || id.split("/").pop();
 
-        return context.body(media.body, media.status as StatusCode, {
+        if (!media.body) {
+            return context.body(null, media.status as StatusCode);
+        }
+
+        return context.body(media.body, media.status as ContentfulStatusCode, {
             "Content-Type":
                 media.headers.get("Content-Type") || "application/octet-stream",
             "Content-Length": media.headers.get("Content-Length") || "0",
diff --git a/app.ts b/app.ts
index f73a9439..822c3272 100644
--- a/app.ts
+++ b/app.ts
@@ -164,7 +164,7 @@ export const appFactory = async (): Promise<OpenAPIHono<HonoEnv>> => {
     applyToHono(app);
 
     app.options("*", (context) => {
-        return context.text("", 204);
+        return context.body(null, 204);
     });
 
     app.all("*", async (context) => {
diff --git a/plugins/openid/routes/sso/:id/index.ts b/plugins/openid/routes/sso/:id/index.ts
index 91cf47da..4d3dbbe8 100644
--- a/plugins/openid/routes/sso/:id/index.ts
+++ b/plugins/openid/routes/sso/:id/index.ts
@@ -201,7 +201,7 @@ export default (plugin: PluginType): void => {
                     .delete(OpenIdAccounts)
                     .where(eq(OpenIdAccounts.id, account.id));
 
-                return context.text("", 204);
+                return context.body(null, 204);
             },
         );
     });