diff --git a/ts/session/utils/Attachments.ts b/ts/session/utils/Attachments.ts
index face38e71..922dc2c01 100644
--- a/ts/session/utils/Attachments.ts
+++ b/ts/session/utils/Attachments.ts
@@ -56,6 +56,8 @@ async function uploadToFileServer(params: UploadParams): Promise<AttachmentPoint
     fileName: attachment.fileName,
     flags: attachment.flags,
     caption: attachment.caption,
+    width: attachment.width,
+    height: attachment.height,
   };
 
   let attachmentData: ArrayBuffer;
diff --git a/ts/session/utils/AttachmentsV2.ts b/ts/session/utils/AttachmentsV2.ts
index 8199289c9..22a08da68 100644
--- a/ts/session/utils/AttachmentsV2.ts
+++ b/ts/session/utils/AttachmentsV2.ts
@@ -36,6 +36,8 @@ async function uploadV3(params: UploadParamsV2): Promise<AttachmentPointerWithUr
     fileName: attachment.fileName,
     flags: attachment.flags,
     caption: attachment.caption,
+    width: attachment.width && isFinite(attachment.width) ? attachment.width : undefined,
+    height: attachment.height && isFinite(attachment.height) ? attachment.height : undefined,
   };
 
   const paddedAttachment: ArrayBuffer = !openGroup
diff --git a/ts/types/Attachment.ts b/ts/types/Attachment.ts
index 5335ce0f1..81d8a4b04 100644
--- a/ts/types/Attachment.ts
+++ b/ts/types/Attachment.ts
@@ -264,6 +264,8 @@ export type Attachment = {
   flags?: SignalService.AttachmentPointer.Flags;
   contentType?: MIME.MIMEType;
   size?: number;
+  width?: number;
+  height?: number;
   data: ArrayBuffer;
 } & Partial<AttachmentSchemaVersion3>;