diff --git a/src/Web/Features/Messages/Handlers/AddMessage.cs b/src/Web/Features/Messages/Handlers/AddMessage.cs
index 222b781..fcb6df3 100644
--- a/src/Web/Features/Messages/Handlers/AddMessage.cs
+++ b/src/Web/Features/Messages/Handlers/AddMessage.cs
@@ -6,6 +6,7 @@ namespace Hutopy.Web.Features.Messages.Handlers;
 
 public class AddMessageRequest
 {
+    public Guid? Id { get; set; }
     public Guid SubjectId { get; set; }
     public string Message { get; set; }
 }
@@ -26,7 +27,7 @@ public class AddMessage(
     {
         var message = new Message
         {
-            Id = GuidHelper.GenerateUuidV7(),
+            Id = req.Id ?? GuidHelper.GenerateUuidV7(),
             SubjectId = req.SubjectId,
             CreatedBy = User.GetUserId(),
             Value = req.Message