diff --git a/packages/core/src/blocks/Image/block.ts b/packages/core/src/blocks/Image/block.ts
index 9de973bb49..e3ba986c6e 100644
--- a/packages/core/src/blocks/Image/block.ts
+++ b/packages/core/src/blocks/Image/block.ts
@@ -122,6 +122,9 @@ export const imageRender =
     image.alt = block.props.name || "";
     image.contentEditable = "false";
     image.draggable = false;
+    if (block.props.previewWidth) {
+      image.width = block.props.previewWidth;
+    }
     imageWrapper.appendChild(image);
 
     return createResizableFileBlockWrapper(
diff --git a/packages/core/src/blocks/Video/block.ts b/packages/core/src/blocks/Video/block.ts
index 9d91ddb6f0..73193e6ddb 100644
--- a/packages/core/src/blocks/Video/block.ts
+++ b/packages/core/src/blocks/Video/block.ts
@@ -92,7 +92,9 @@ export const createVideoBlockSpec = createBlockSpec(
       video.controls = true;
       video.contentEditable = "false";
       video.draggable = false;
-      video.width = block.props.previewWidth;
+      if (block.props.previewWidth) {
+        video.width = block.props.previewWidth;
+      }
       videoWrapper.appendChild(video);
 
       return createResizableFileBlockWrapper(
diff --git a/packages/react/src/blocks/Image/block.tsx b/packages/react/src/blocks/Image/block.tsx
index be682b47c2..870a16ec5c 100644
--- a/packages/react/src/blocks/Image/block.tsx
+++ b/packages/react/src/blocks/Image/block.tsx
@@ -32,6 +32,7 @@ export const ImagePreview = (
           : resolved.downloadUrl
       }
       alt={alt}
+      width={props.block.props.previewWidth}
       contentEditable={false}
       draggable={false}
     />
diff --git a/packages/react/src/blocks/Video/block.tsx b/packages/react/src/blocks/Video/block.tsx
index 08a8f47d53..832794c095 100644
--- a/packages/react/src/blocks/Video/block.tsx
+++ b/packages/react/src/blocks/Video/block.tsx
@@ -27,6 +27,7 @@ export const VideoPreview = (
           : resolved.downloadUrl
       }
       controls={true}
+      width={props.block.props.previewWidth || undefined}
       contentEditable={false}
       draggable={false}
     />
@@ -44,7 +45,7 @@ export const VideoToExternalHTML = (
   }
 
   const video = props.block.props.showPreview ? (
-    <video src={props.block.props.url} />
+    <video src={props.block.props.url} width={props.block.props.previewWidth || undefined} />
   ) : (
     <a href={props.block.props.url}>
       {props.block.props.name || props.block.props.url}
diff --git a/packages/server-util/src/context/__snapshots__/ServerBlockNoteEditor.test.ts.snap b/packages/server-util/src/context/__snapshots__/ServerBlockNoteEditor.test.ts.snap
index 777d7a773f..f088373cc6 100644
--- a/packages/server-util/src/context/__snapshots__/ServerBlockNoteEditor.test.ts.snap
+++ b/packages/server-util/src/context/__snapshots__/ServerBlockNoteEditor.test.ts.snap
@@ -1,6 +1,6 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`Test ServerBlockNoteEditor > converts to HTML (blocksToFullHTML) 1`] = `"<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="heading" data-background-color="blue" data-text-color="yellow" data-text-alignment="right" data-level="2"><h2 class="bn-inline-content"><strong><u>Heading </u></strong><em><s>2</s></em></h2></div><div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="2"><div class="bn-block" data-node-type="blockContainer" data-id="2"><div class="bn-block-content" data-content-type="paragraph" data-background-color="red"><p class="bn-inline-content">Paragraph</p></div></div></div><div class="bn-block-outer" data-node-type="blockOuter" data-id="3"><div class="bn-block" data-node-type="blockContainer" data-id="3"><div class="bn-block-content" data-content-type="bulletListItem"><p class="bn-inline-content">list item</p></div></div></div></div></div></div><div class="bn-block-outer" data-node-type="blockOuter" data-id="4"><div class="bn-block" data-node-type="blockContainer" data-id="4"><div class="bn-block-content" data-content-type="image" data-name="Example" data-url="exampleURL" data-caption="Caption" data-preview-width="256" data-file-block=""><figure class="bn-file-block-content-wrapper" style="position: relative; width: 256px;"><div class="bn-visual-media-wrapper"><img class="bn-visual-media" src="exampleURL" alt="Example" draggable="false"><div class="bn-resize-handle" style="left: 4px; display: none;"></div><div class="bn-resize-handle" style="right: 4px; display: none;"></div></div><figcaption class="bn-file-caption">Caption</figcaption></figure></div></div></div><div class="bn-block-outer" data-node-type="blockOuter" data-id="5"><div class="bn-block" data-node-type="blockContainer" data-id="5"><div class="bn-block-content" data-content-type="image" data-name="Example" data-url="exampleURL" data-caption="Caption" data-show-preview="false" data-preview-width="256" data-file-block=""><figure class="bn-file-block-content-wrapper" style="position: relative;"><div class="bn-file-name-with-icon"><div class="bn-file-icon"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M3 8L9.00319 2H19.9978C20.5513 2 21 2.45531 21 2.9918V21.0082C21 21.556 20.5551 22 20.0066 22H3.9934C3.44476 22 3 21.5501 3 20.9932V8ZM10 4V9H5V20H19V4H10Z"></path></svg></div><p class="bn-file-name">Example</p></div><figcaption class="bn-file-caption">Caption</figcaption></figure></div></div></div></div>"`;
+exports[`Test ServerBlockNoteEditor > converts to HTML (blocksToFullHTML) 1`] = `"<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="heading" data-background-color="blue" data-text-color="yellow" data-text-alignment="right" data-level="2"><h2 class="bn-inline-content"><strong><u>Heading </u></strong><em><s>2</s></em></h2></div><div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="2"><div class="bn-block" data-node-type="blockContainer" data-id="2"><div class="bn-block-content" data-content-type="paragraph" data-background-color="red"><p class="bn-inline-content">Paragraph</p></div></div></div><div class="bn-block-outer" data-node-type="blockOuter" data-id="3"><div class="bn-block" data-node-type="blockContainer" data-id="3"><div class="bn-block-content" data-content-type="bulletListItem"><p class="bn-inline-content">list item</p></div></div></div></div></div></div><div class="bn-block-outer" data-node-type="blockOuter" data-id="4"><div class="bn-block" data-node-type="blockContainer" data-id="4"><div class="bn-block-content" data-content-type="image" data-name="Example" data-url="exampleURL" data-caption="Caption" data-preview-width="256" data-file-block=""><figure class="bn-file-block-content-wrapper" style="position: relative; width: 256px;"><div class="bn-visual-media-wrapper"><img class="bn-visual-media" src="exampleURL" alt="Example" draggable="false" width="256"><div class="bn-resize-handle" style="left: 4px; display: none;"></div><div class="bn-resize-handle" style="right: 4px; display: none;"></div></div><figcaption class="bn-file-caption">Caption</figcaption></figure></div></div></div><div class="bn-block-outer" data-node-type="blockOuter" data-id="5"><div class="bn-block" data-node-type="blockContainer" data-id="5"><div class="bn-block-content" data-content-type="image" data-name="Example" data-url="exampleURL" data-caption="Caption" data-show-preview="false" data-preview-width="256" data-file-block=""><figure class="bn-file-block-content-wrapper" style="position: relative;"><div class="bn-file-name-with-icon"><div class="bn-file-icon"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M3 8L9.00319 2H19.9978C20.5513 2 21 2.45531 21 2.9918V21.0082C21 21.556 20.5551 22 20.0066 22H3.9934C3.44476 22 3 21.5501 3 20.9932V8ZM10 4V9H5V20H19V4H10Z"></path></svg></div><p class="bn-file-name">Example</p></div><figcaption class="bn-file-caption">Caption</figcaption></figure></div></div></div></div>"`;
 
 exports[`Test ServerBlockNoteEditor > converts to and from HTML (blocksToHTMLLossy) 1`] = `"<h2 style="background-color: rgb(221, 235, 241); color: rgb(223, 171, 1); text-align: right;" data-background-color="blue" data-text-color="yellow" data-text-alignment="right" data-level="2"><strong><u>Heading </u></strong><em><s>2</s></em></h2><p style="background-color: rgb(251, 228, 228);" data-background-color="red" data-nesting-level="1">Paragraph</p><ul><li data-nesting-level="1"><p class="bn-inline-content">list item</p></li></ul><figure data-name="Example" data-url="exampleURL" data-caption="Caption" data-preview-width="256"><img src="exampleURL" alt="Example" width="256"><figcaption>Caption</figcaption></figure><div data-name="Example" data-url="exampleURL" data-caption="Caption" data-show-preview="false" data-preview-width="256"><a href="exampleURL">Example</a><p>Caption</p></div>"`;
 
diff --git a/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/image/basic.html b/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/image/basic.html
index 55c9555506..8700c93f57 100644
--- a/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/image/basic.html
+++ b/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/image/basic.html
@@ -15,7 +15,13 @@
           style="position: relative; width: 256px;"
         >
           <div class="bn-visual-media-wrapper">
-            <img class="bn-visual-media" src="exampleURL" alt="example" draggable="false" />
+            <img
+              class="bn-visual-media"
+              src="exampleURL"
+              alt="example"
+              draggable="false"
+              width="256"
+            />
             <div class="bn-resize-handle" style="left: 4px; display: none;"></div>
             <div class="bn-resize-handle" style="right: 4px; display: none;"></div>
           </div>
diff --git a/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/image/nested.html b/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/image/nested.html
index a5b2647bec..b7d2064ce9 100644
--- a/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/image/nested.html
+++ b/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/image/nested.html
@@ -14,7 +14,13 @@
           style="position: relative; width: 256px;"
         >
           <div class="bn-visual-media-wrapper">
-            <img class="bn-visual-media" src="exampleURL" alt="" draggable="false" />
+            <img
+              class="bn-visual-media"
+              src="exampleURL"
+              alt=""
+              draggable="false"
+              width="256"
+            />
             <div class="bn-resize-handle" style="left: 4px; display: none;"></div>
             <div class="bn-resize-handle" style="right: 4px; display: none;"></div>
           </div>
@@ -37,7 +43,13 @@
                 style="position: relative; width: 256px;"
               >
                 <div class="bn-visual-media-wrapper">
-                  <img class="bn-visual-media" src="exampleURL" alt="" draggable="false" />
+                  <img
+                    class="bn-visual-media"
+                    src="exampleURL"
+                    alt=""
+                    draggable="false"
+                    width="256"
+                  />
                   <div class="bn-resize-handle" style="left: 4px; display: none;"></div>
                   <div class="bn-resize-handle" style="right: 4px; display: none;"></div>
                 </div>
diff --git a/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/image/noCaption.html b/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/image/noCaption.html
index 67d4f962f0..44b706cebe 100644
--- a/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/image/noCaption.html
+++ b/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/image/noCaption.html
@@ -14,7 +14,13 @@
           style="position: relative; width: 256px;"
         >
           <div class="bn-visual-media-wrapper">
-            <img class="bn-visual-media" src="exampleURL" alt="example" draggable="false" />
+            <img
+              class="bn-visual-media"
+              src="exampleURL"
+              alt="example"
+              draggable="false"
+              width="256"
+            />
             <div class="bn-resize-handle" style="left: 4px; display: none;"></div>
             <div class="bn-resize-handle" style="right: 4px; display: none;"></div>
           </div>
diff --git a/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/image/noName.html b/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/image/noName.html
index 7032fc34e8..2a2bbd7a8d 100644
--- a/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/image/noName.html
+++ b/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/image/noName.html
@@ -14,7 +14,13 @@
           style="position: relative; width: 256px;"
         >
           <div class="bn-visual-media-wrapper">
-            <img class="bn-visual-media" src="exampleURL" alt="" draggable="false" />
+            <img
+              class="bn-visual-media"
+              src="exampleURL"
+              alt=""
+              draggable="false"
+              width="256"
+            />
             <div class="bn-resize-handle" style="left: 4px; display: none;"></div>
             <div class="bn-resize-handle" style="right: 4px; display: none;"></div>
           </div>
diff --git a/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/video.html b/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/video.html
index 8bc01016c4..78babe7a23 100644
--- a/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/video.html
+++ b/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/video.html
@@ -17,7 +17,6 @@
               src="https://interactive-examples.mdn.mozilla.net/media/cc0-videos/flower.webm"
               controls=""
               draggable="false"
-              width="0"
             ></video>
             <div class="bn-resize-handle" style="left: 4px; display: none;"></div>
             <div class="bn-resize-handle" style="right: 4px; display: none;"></div>
diff --git a/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/video/withCaption.html b/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/video/withCaption.html
index b85963a4e8..951b9d8b86 100644
--- a/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/video/withCaption.html
+++ b/tests/src/unit/core/formatConversion/export/__snapshots__/blocknoteHTML/video/withCaption.html
@@ -19,7 +19,6 @@
               src="https://example.com/video.mp4"
               controls=""
               draggable="false"
-              width="0"
             ></video>
             <div class="bn-resize-handle" style="left: 4px; display: none;"></div>
             <div class="bn-resize-handle" style="right: 4px; display: none;"></div>
diff --git a/tests/src/unit/react/formatConversion/export/__snapshots__/blocknoteHTML/reactImage/basic.html b/tests/src/unit/react/formatConversion/export/__snapshots__/blocknoteHTML/reactImage/basic.html
index 55c9555506..8700c93f57 100644
--- a/tests/src/unit/react/formatConversion/export/__snapshots__/blocknoteHTML/reactImage/basic.html
+++ b/tests/src/unit/react/formatConversion/export/__snapshots__/blocknoteHTML/reactImage/basic.html
@@ -15,7 +15,13 @@
           style="position: relative; width: 256px;"
         >
           <div class="bn-visual-media-wrapper">
-            <img class="bn-visual-media" src="exampleURL" alt="example" draggable="false" />
+            <img
+              class="bn-visual-media"
+              src="exampleURL"
+              alt="example"
+              draggable="false"
+              width="256"
+            />
             <div class="bn-resize-handle" style="left: 4px; display: none;"></div>
             <div class="bn-resize-handle" style="right: 4px; display: none;"></div>
           </div>
diff --git a/tests/src/unit/react/formatConversion/export/__snapshots__/blocknoteHTML/reactImage/nested.html b/tests/src/unit/react/formatConversion/export/__snapshots__/blocknoteHTML/reactImage/nested.html
index a6296f823b..bed56f5a3d 100644
--- a/tests/src/unit/react/formatConversion/export/__snapshots__/blocknoteHTML/reactImage/nested.html
+++ b/tests/src/unit/react/formatConversion/export/__snapshots__/blocknoteHTML/reactImage/nested.html
@@ -15,7 +15,13 @@
           style="position: relative; width: 256px;"
         >
           <div class="bn-visual-media-wrapper">
-            <img class="bn-visual-media" src="exampleURL" alt="example" draggable="false" />
+            <img
+              class="bn-visual-media"
+              src="exampleURL"
+              alt="example"
+              draggable="false"
+              width="256"
+            />
             <div class="bn-resize-handle" style="left: 4px; display: none;"></div>
             <div class="bn-resize-handle" style="right: 4px; display: none;"></div>
           </div>
@@ -39,7 +45,13 @@
                 style="position: relative; width: 256px;"
               >
                 <div class="bn-visual-media-wrapper">
-                  <img class="bn-visual-media" src="exampleURL" alt="example" draggable="false" />
+                  <img
+                    class="bn-visual-media"
+                    src="exampleURL"
+                    alt="example"
+                    draggable="false"
+                    width="256"
+                  />
                   <div class="bn-resize-handle" style="left: 4px; display: none;"></div>
                   <div class="bn-resize-handle" style="right: 4px; display: none;"></div>
                 </div>
diff --git a/tests/src/unit/react/formatConversion/export/__snapshots__/blocknoteHTML/reactImage/noCaption.html b/tests/src/unit/react/formatConversion/export/__snapshots__/blocknoteHTML/reactImage/noCaption.html
index 67d4f962f0..44b706cebe 100644
--- a/tests/src/unit/react/formatConversion/export/__snapshots__/blocknoteHTML/reactImage/noCaption.html
+++ b/tests/src/unit/react/formatConversion/export/__snapshots__/blocknoteHTML/reactImage/noCaption.html
@@ -14,7 +14,13 @@
           style="position: relative; width: 256px;"
         >
           <div class="bn-visual-media-wrapper">
-            <img class="bn-visual-media" src="exampleURL" alt="example" draggable="false" />
+            <img
+              class="bn-visual-media"
+              src="exampleURL"
+              alt="example"
+              draggable="false"
+              width="256"
+            />
             <div class="bn-resize-handle" style="left: 4px; display: none;"></div>
             <div class="bn-resize-handle" style="right: 4px; display: none;"></div>
           </div>
diff --git a/tests/src/unit/react/formatConversion/export/__snapshots__/blocknoteHTML/reactImage/noName.html b/tests/src/unit/react/formatConversion/export/__snapshots__/blocknoteHTML/reactImage/noName.html
index 7032fc34e8..2a2bbd7a8d 100644
--- a/tests/src/unit/react/formatConversion/export/__snapshots__/blocknoteHTML/reactImage/noName.html
+++ b/tests/src/unit/react/formatConversion/export/__snapshots__/blocknoteHTML/reactImage/noName.html
@@ -14,7 +14,13 @@
           style="position: relative; width: 256px;"
         >
           <div class="bn-visual-media-wrapper">
-            <img class="bn-visual-media" src="exampleURL" alt="" draggable="false" />
+            <img
+              class="bn-visual-media"
+              src="exampleURL"
+              alt=""
+              draggable="false"
+              width="256"
+            />
             <div class="bn-resize-handle" style="left: 4px; display: none;"></div>
             <div class="bn-resize-handle" style="right: 4px; display: none;"></div>
           </div>