diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts
index 9dbad645e..212049921 100644
--- a/src/api/util/handlers/Message.ts
+++ b/src/api/util/handlers/Message.ts
@@ -486,6 +486,10 @@ export async function handleMessage(opts: MessageOptions): Promise<Message> {
 
     message.content = opts.content?.trim();
 
+    if (message.poll && opts.poll?.duration) {
+        message.poll.expiry = new Date(Date.now() + opts.poll.duration * 3600000);
+    }
+
     await handleMessageMentionsAsync(message);
 
     const attachmentIndices = new Map(message.attachments?.map((attachment, index) => [`attachment://${attachment.filename}`, index]));