diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64459b17..c88de8fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file.
 
 **Fixed**
 
+- Markdown tables would hang edit mode, now tables are correctly rendered (#788)
 - Detach all engines when the window is closed (thanks to @ebifrier, #700)
 - Analysis variation replay was not removed when navigating to a different node
   (thanks to @ebifrier, #712)
diff --git a/src/components/MarkdownContentDisplay.js b/src/components/MarkdownContentDisplay.js
index 2a78708d..6c5b306a 100644
--- a/src/components/MarkdownContentDisplay.js
+++ b/src/components/MarkdownContentDisplay.js
@@ -34,6 +34,7 @@ const Emphasis = generateBasicComponent('em')
 const Strong = generateBasicComponent('strong')
 const Delete = generateBasicComponent('del')
 const ListItem = generateBasicComponent('li')
+const Table = generateBasicComponent('table')
 
 function Paragraph({children}) {
   return h('p', {}, htmlify(children))
@@ -76,7 +77,7 @@ class MarkdownContentDisplay extends Component {
         image: Image,
         linkReference: Link,
         imageReference: Image,
-        table: null,
+        table: Table,
         listItem: ListItem,
         heading: Heading,
         code: Paragraph,