diff --git a/src/hydration/channel.ts b/src/hydration/channel.ts
index 770c0f47..64578bc9 100644
--- a/src/hydration/channel.ts
+++ b/src/hydration/channel.ts
@@ -1,7 +1,7 @@
 import { ReactiveSet } from "@solid-primitives/set";
 import { Channel as ApiChannel, OverrideField } from "revolt-api";
 
-import { File } from "..";
+import { Client, File } from "..";
 import type { Merge } from "../lib/merge";
 
 import { Hydrate } from ".";
@@ -47,7 +47,7 @@ export const channelHydration: Hydrate<Merge<ApiChannel>, HydratedChannel> = {
     channelType: (channel) => channel.channel_type,
     name: (channel) => channel.name,
     description: (channel) => channel.description!,
-    icon: (channel, ctx) => new File(ctx, channel.icon!),
+    icon: (channel, ctx) => new File(ctx as Client, channel.icon!),
     active: (channel) => channel.active || false,
     typingIds: () => new ReactiveSet(),
     recipientIds: (channel) => new ReactiveSet(channel.recipients),
diff --git a/src/hydration/message.ts b/src/hydration/message.ts
index e4385396..97be07fb 100644
--- a/src/hydration/message.ts
+++ b/src/hydration/message.ts
@@ -1,7 +1,7 @@
 import { ReactiveMap } from "@solid-primitives/map";
 import { ReactiveSet } from "@solid-primitives/set";
 
-import { API, File, MessageEmbed, SystemMessage } from "..";
+import { API, Client, File, MessageEmbed, SystemMessage } from "..";
 import type { Merge } from "../lib/merge";
 
 import { Hydrate } from ".";
@@ -39,12 +39,13 @@ export const messageHydration: Hydrate<Merge<API.Message>, HydratedMessage> = {
     channelId: (message) => message.channel,
     authorId: (message) => message.author,
     content: (message) => message.content!,
-    systemMessage: (message, ctx) => SystemMessage.from(ctx, message.system!),
+    systemMessage: (message, ctx) =>
+      SystemMessage.from(ctx as Client, message.system!),
     attachments: (message, ctx) =>
-      message.attachments!.map((file) => new File(ctx, file)),
+      message.attachments!.map((file) => new File(ctx as Client, file)),
     editedAt: (message) => new Date(message.edited!),
     embeds: (message, ctx) =>
-      message.embeds!.map((embed) => MessageEmbed.from(ctx, embed)),
+      message.embeds!.map((embed) => MessageEmbed.from(ctx as Client, embed)),
     mentionIds: (message) => message.mentions!,
     replyIds: (message) => message.replies!,
     reactions: (message) => {
diff --git a/src/hydration/server.ts b/src/hydration/server.ts
index aa586dc5..420076c0 100644
--- a/src/hydration/server.ts
+++ b/src/hydration/server.ts
@@ -7,7 +7,7 @@ import {
   SystemMessageChannels,
 } from "revolt-api";
 
-import { File } from "..";
+import { Client, File } from "..";
 
 import { Hydrate } from ".";
 
@@ -55,8 +55,8 @@ export const serverHydration: Hydrate<ApiServer, HydratedServer> = {
         Object.keys(server.roles!).map((id) => [id, server.roles![id]])
       ),
     defaultPermissions: (server) => server.default_permissions,
-    icon: (server, ctx) => new File(ctx, server.icon!),
-    banner: (server, ctx) => new File(ctx, server.banner!),
+    icon: (server, ctx) => new File(ctx as Client, server.icon!),
+    banner: (server, ctx) => new File(ctx as Client, server.banner!),
     flags: (server) => server.flags!,
     analytics: (server) => server.analytics || false,
     discoverable: (server) => server.discoverable || false,
diff --git a/src/hydration/serverMember.ts b/src/hydration/serverMember.ts
index cb143155..b80febb1 100644
--- a/src/hydration/serverMember.ts
+++ b/src/hydration/serverMember.ts
@@ -1,6 +1,6 @@
 import { Member as ApiMember, MemberCompositeKey } from "revolt-api";
 
-import { File } from "..";
+import { Client, File } from "..";
 import type { Merge } from "../lib/merge";
 
 import { Hydrate } from ".";
@@ -26,7 +26,7 @@ export const serverMemberHydration: Hydrate<
     id: (member) => member._id,
     joinedAt: (member) => new Date(member.joined_at),
     nickname: (member) => member.nickname!,
-    avatar: (member, ctx) => new File(ctx, member.avatar!),
+    avatar: (member, ctx) => new File(ctx as Client, member.avatar!),
     roles: (member) => member.roles,
     timeout: (member) => new Date(member.timeout!),
   },
diff --git a/src/hydration/user.ts b/src/hydration/user.ts
index c1974087..130ce608 100644
--- a/src/hydration/user.ts
+++ b/src/hydration/user.ts
@@ -5,7 +5,7 @@ import {
   UserStatus,
 } from "revolt-api";
 
-import { File } from "..";
+import { Client, File } from "..";
 
 import { Hydrate } from ".";
 
@@ -40,7 +40,7 @@ export const userHydration: Hydrate<ApiUser, HydratedUser> = {
     badges: (user) => user.badges!,
     flags: (user) => user.flags!,
 
-    avatar: (user, ctx) => new File(ctx, user.avatar!),
+    avatar: (user, ctx) => new File(ctx as Client, user.avatar!),
     status: (user) => user.status!,
     bot: (user) => user.bot!,
   },