diff --git a/api/src/chat/schemas/types/message.ts b/api/src/chat/schemas/types/message.ts
index 4cacffa7..451d7db4 100644
--- a/api/src/chat/schemas/types/message.ts
+++ b/api/src/chat/schemas/types/message.ts
@@ -280,10 +280,7 @@ export type StdOutgoingButtonsEnvelope = z.infer<
 >;
 
 export const stdOutgoingListEnvelopeSchema = z.object({
-  format: z.union([
-    z.literal(OutgoingMessageFormat.list),
-    z.literal(OutgoingMessageFormat.carousel),
-  ]),
+  format: z.enum(['list', 'carousel']),
   message: stdOutgoingListMessageSchema,
 });
 
diff --git a/api/src/chat/schemas/types/options.ts b/api/src/chat/schemas/types/options.ts
index 79ddacf0..f413a56d 100644
--- a/api/src/chat/schemas/types/options.ts
+++ b/api/src/chat/schemas/types/options.ts
@@ -9,10 +9,9 @@
 import { z } from 'zod';
 
 import { buttonSchema } from './button';
-import { OutgoingMessageFormat } from './message';
 
 export const contentOptionsSchema = z.object({
-  display: z.nativeEnum(OutgoingMessageFormat),
+  display: z.enum(['list', 'carousel']),
   fields: z.object({
     title: z.string(),
     subtitle: z.string().nullable(),
diff --git a/api/src/chat/services/block.service.ts b/api/src/chat/services/block.service.ts
index b92d3d5e..bba56b8a 100644
--- a/api/src/chat/services/block.service.ts
+++ b/api/src/chat/services/block.service.ts
@@ -576,13 +576,13 @@ export class BlockService extends BaseService<
           contentBlockOptions,
           skip,
         );
-        const envelope = {
+        const envelope: StdOutgoingEnvelope = {
           format: contentBlockOptions.display,
           message: {
             ...results,
             options: contentBlockOptions,
           },
-        } as StdOutgoingEnvelope;
+        };
         return envelope;
       } catch (err) {
         this.logger.error(