diff --git a/frontend/app/shared/components/rich-editor.component.ts b/frontend/app/shared/components/rich-editor.component.ts
index 3b3999ed7..216272047 100644
--- a/frontend/app/shared/components/rich-editor.component.ts
+++ b/frontend/app/shared/components/rich-editor.component.ts
@@ -208,7 +208,11 @@ export class RichEditorComponent extends StatefulControlComponent<undefined, str
         let content = '';
 
         for (const asset of assets) {
-            content += `<img src="${asset.fullUrl(this.apiUrl)}" alt="${asset.fileName}" />`;
+            if (asset.type === 'Video') {
+                content += `<video src="${asset.fullUrl(this.apiUrl)}" />`;
+            } else {
+                content += `<img src="${asset.fullUrl(this.apiUrl)}" alt="${asset.fileName}" />`;
+            }
         }
 
         if (content.length > 0) {
@@ -238,7 +242,11 @@ export class RichEditorComponent extends StatefulControlComponent<undefined, str
         this.assetUploader.uploadFile(file)
             .subscribe(asset => {
                 if (Types.is(asset, AssetDto)) {
-                    replaceText(`<img src="${asset.fullUrl(this.apiUrl)}" alt="${asset.fileName}" />`);
+                    if (asset.type === 'Video') {
+                        replaceText(`<video src="${asset.fullUrl(this.apiUrl)}" />`);
+                    } else {
+                        replaceText(`<img src="${asset.fullUrl(this.apiUrl)}" alt="${asset.fileName}" />`);
+                    }
                 }
             }, error => {
                 if (!Types.is(error, UploadCanceled)) {