diff --git a/api/src/chat/schemas/types/channel.ts b/api/src/chat/schemas/types/channel.ts
index 06359493..dee41f1c 100644
--- a/api/src/chat/schemas/types/channel.ts
+++ b/api/src/chat/schemas/types/channel.ts
@@ -1,11 +1,13 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
+import { z } from 'zod';
+
 import { ChannelName } from '@/channel/types';
 
 export type SubscriberChannelData<C extends ChannelName = 'unknown-channel'> =
@@ -17,3 +19,11 @@ export type SubscriberChannelData<C extends ChannelName = 'unknown-channel'> =
         // Channel's specific attributes
         [P in keyof SubscriberChannelDict[C]]: SubscriberChannelDict[C][P];
       };
+
+export const channelDataSchema = z
+  .object({
+    name: z.string().regex(/-channel$/) as z.ZodType<ChannelName>,
+  })
+  .passthrough();
+
+export type Channel = z.infer<typeof channelDataSchema>;
diff --git a/api/src/chat/validation-rules/is-channel-data.ts b/api/src/chat/validation-rules/is-channel-data.ts
index 3dbd4c2d..5bb6082e 100644
--- a/api/src/chat/validation-rules/is-channel-data.ts
+++ b/api/src/chat/validation-rules/is-channel-data.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -13,17 +13,15 @@ import {
   ValidatorConstraintInterface,
 } from 'class-validator';
 
-export function isChannelData(channel: any) {
-  return (
-    typeof channel === 'object' &&
-    channel.name &&
-    typeof channel.name === 'string'
-  );
+import { Channel, channelDataSchema } from '../schemas/types/channel';
+
+export function isChannelData(channel: Channel) {
+  return channelDataSchema.safeParse(channel).success;
 }
 
 @ValidatorConstraint({ async: false })
 export class ChannelDataValidator implements ValidatorConstraintInterface {
-  validate(channel: any) {
+  validate(channel: Channel) {
     return isChannelData(channel);
   }
 }