diff --git a/client/src/components/FileViewer/index.jsx b/client/src/components/FileViewer/index.jsx
index 8cd0172e..0d3d4866 100644
--- a/client/src/components/FileViewer/index.jsx
+++ b/client/src/components/FileViewer/index.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import ReactMarkdown from 'react-markdown';
+// TODO: get markdown settings from siteConfig
 
 class FileViewer extends React.Component {
 
diff --git a/client/src/containers/AssetInfo/view.jsx b/client/src/containers/AssetInfo/view.jsx
index 70d63298..c1e6154d 100644
--- a/client/src/containers/AssetInfo/view.jsx
+++ b/client/src/containers/AssetInfo/view.jsx
@@ -22,6 +22,7 @@ class AssetInfo extends React.Component {
     const canonicalUrl = createCanonicalLink({ asset: { ...claimData, shortId: asset.shortId }});
     const assetCanonicalUrl = `${host}${canonicalUrl}`;
     // Todo Issue #882 centralize all this media type detection
+    // Todo get markdown settings from siteConfig
     const embedable = contentType.split('/')[0] === 'image' || contentType === 'video/mp4';
 
     let channelCanonicalUrl;
@@ -37,7 +38,7 @@ class AssetInfo extends React.Component {
         { description && (
           <RowLabeled
             label={<Label value={'Description'} />}
-            content={<div className='asset-info__description'><ReactMarkdown className={'markdown-preview'} source={description} /></div>}
+            content={<div className='asset-info__description'><ReactMarkdown className={'markdown-preview'} skipHtml disallowedTypes={['image']} source={description} /></div>}
           />
         )}
         {editable && (