diff --git a/app/components/Editor.js b/app/components/Editor/Editor.js
similarity index 75%
rename from app/components/Editor.js
rename to app/components/Editor/Editor.js
index b8679c2667..b117ba74bf 100644
--- a/app/components/Editor.js
+++ b/app/components/Editor/Editor.js
@@ -3,12 +3,15 @@ import * as React from 'react';
 import RichMarkdownEditor from 'rich-markdown-editor';
 import { uploadFile } from 'utils/uploadFile';
 import isInternalUrl from 'utils/isInternalUrl';
+import Embed from './Embed';
+import embeds from '../../embeds';
 
 type Props = {
   titlePlaceholder?: string,
   bodyPlaceholder?: string,
   defaultValue?: string,
   readOnly?: boolean,
+  disableEmbeds?: boolean,
   forwardedRef: *,
   history: *,
   ui: *,
@@ -51,6 +54,22 @@ class Editor extends React.Component<Props> {
     this.props.ui.showToast(message, 'success');
   };
 
+  getLinkComponent = node => {
+    if (this.props.disableEmbeds) return;
+
+    const url = node.data.get('href');
+    const keys = Object.keys(embeds);
+
+    for (const key of keys) {
+      const component = embeds[key];
+
+      for (const host of component.ENABLED) {
+        const matches = url.match(host);
+        if (matches) return Embed;
+      }
+    }
+  };
+
   render() {
     return (
       <RichMarkdownEditor
@@ -58,6 +77,7 @@ class Editor extends React.Component<Props> {
         uploadImage={this.onUploadImage}
         onClickLink={this.onClickLink}
         onShowToast={this.onShowToast}
+        getLinkComponent={this.getLinkComponent}
         {...this.props}
       />
     );
diff --git a/app/components/Editor/Embed.js b/app/components/Editor/Embed.js
new file mode 100644
index 0000000000..0b50cf61bd
--- /dev/null
+++ b/app/components/Editor/Embed.js
@@ -0,0 +1,52 @@
+// @flow
+import * as React from 'react';
+import styled from 'styled-components';
+import { fadeIn } from 'shared/styles/animations';
+import embeds from '../../embeds';
+
+export default class Embed extends React.Component<*> {
+  get url(): string {
+    return this.props.node.data.get('href');
+  }
+
+  get matches(): ?{ component: *, matches: string[] } {
+    const keys = Object.keys(embeds);
+
+    for (const key of keys) {
+      const component = embeds[key];
+
+      for (const host of component.ENABLED) {
+        const matches = this.url.match(host);
+        if (matches) return { component, matches };
+      }
+    }
+  }
+
+  render() {
+    const result = this.matches;
+    if (!result) return null;
+
+    const { attributes, isSelected } = this.props;
+    const { component, matches } = result;
+    const EmbedComponent = component;
+
+    return (
+      <Container
+        contentEditable={false}
+        isSelected={isSelected}
+        {...attributes}
+      >
+        <EmbedComponent matches={matches} url={this.url} />
+      </Container>
+    );
+  }
+}
+
+const Container = styled.div`
+  animation: ${fadeIn} 500ms ease-in-out;
+  line-height: 0;
+
+  border-radius: 3px;
+  box-shadow: ${props =>
+    props.isSelected ? `0 0 0 2px ${props.theme.selected}` : 'none'};
+`;
diff --git a/app/components/Editor/index.js b/app/components/Editor/index.js
new file mode 100644
index 0000000000..223d4abd1d
--- /dev/null
+++ b/app/components/Editor/index.js
@@ -0,0 +1,3 @@
+// @flow
+import Editor from './Editor';
+export default Editor;
diff --git a/app/embeds/Airtable.js b/app/embeds/Airtable.js
new file mode 100644
index 0000000000..7e0be8dd24
--- /dev/null
+++ b/app/embeds/Airtable.js
@@ -0,0 +1,27 @@
+// @flow
+import * as React from 'react';
+import Frame from './components/Frame';
+
+const URL_REGEX = new RegExp('https://airtable.com/(?:embed/)?(shr.*)$');
+
+type Props = {
+  url: string,
+  matches: string[],
+};
+
+export default class Airtable extends React.Component<Props> {
+  static ENABLED = [URL_REGEX];
+
+  render() {
+    const { matches } = this.props;
+    const shareId = matches[1];
+
+    return (
+      <Frame
+        src={`https://airtable.com/embed/${shareId}`}
+        title={`Airtable (${shareId})`}
+        border
+      />
+    );
+  }
+}
diff --git a/app/embeds/Airtable.test.js b/app/embeds/Airtable.test.js
new file mode 100644
index 0000000000..d18702ff4c
--- /dev/null
+++ b/app/embeds/Airtable.test.js
@@ -0,0 +1,23 @@
+/* eslint-disable flowtype/require-valid-file-annotation */
+import embeds from '.';
+
+const { Airtable } = embeds;
+
+describe('Airtable', () => {
+  const match = Airtable.ENABLED[0];
+  test('to be enabled on share link', () => {
+    expect('https://airtable.com/shrEoQs3erLnppMie'.match(match)).toBeTruthy();
+  });
+
+  test('to be enabled on embed link', () => {
+    expect(
+      'https://airtable.com/embed/shrEoQs3erLnppMie'.match(match)
+    ).toBeTruthy();
+  });
+
+  test('to not be enabled elsewhere', () => {
+    expect('https://airtable.com'.match(match)).toBe(null);
+    expect('https://airtable.com/features'.match(match)).toBe(null);
+    expect('https://airtable.com/pricing'.match(match)).toBe(null);
+  });
+});
diff --git a/app/embeds/Codepen.js b/app/embeds/Codepen.js
new file mode 100644
index 0000000000..0fc0acdff2
--- /dev/null
+++ b/app/embeds/Codepen.js
@@ -0,0 +1,19 @@
+// @flow
+import * as React from 'react';
+import Frame from './components/Frame';
+
+const URL_REGEX = new RegExp('^https://codepen.io/(.*?)/(pen|embed)/(.*)$');
+
+type Props = {
+  url: string,
+};
+
+export default class Codepen extends React.Component<Props> {
+  static ENABLED = [URL_REGEX];
+
+  render() {
+    const normalizedUrl = this.props.url.replace(/\/pen\//, '/embed/');
+
+    return <Frame src={normalizedUrl} title="Codepen Embed" />;
+  }
+}
diff --git a/app/embeds/Codepen.test.js b/app/embeds/Codepen.test.js
new file mode 100644
index 0000000000..24303d17b5
--- /dev/null
+++ b/app/embeds/Codepen.test.js
@@ -0,0 +1,24 @@
+/* eslint-disable flowtype/require-valid-file-annotation */
+import embeds from '.';
+
+const { Codepen } = embeds;
+
+describe('Codepen', () => {
+  const match = Codepen.ENABLED[0];
+  test('to be enabled on pen link', () => {
+    expect(
+      'https://codepen.io/chriscoyier/pen/gfdDu'.match(match)
+    ).toBeTruthy();
+  });
+
+  test('to be enabled on embed link', () => {
+    expect(
+      'https://codepen.io/chriscoyier/embed/gfdDu'.match(match)
+    ).toBeTruthy();
+  });
+
+  test('to not be enabled elsewhere', () => {
+    expect('https://codepen.io'.match(match)).toBe(null);
+    expect('https://codepen.io/chriscoyier'.match(match)).toBe(null);
+  });
+});
diff --git a/app/embeds/Figma.js b/app/embeds/Figma.js
new file mode 100644
index 0000000000..8e622ebe0d
--- /dev/null
+++ b/app/embeds/Figma.js
@@ -0,0 +1,27 @@
+// @flow
+import * as React from 'react';
+import Frame from './components/Frame';
+
+const URL_REGEX = new RegExp(
+  'https://([w.-]+.)?figma.com/(file|proto)/([0-9a-zA-Z]{22,128})(?:/.*)?$'
+);
+
+type Props = {
+  url: string,
+};
+
+export default class Figma extends React.Component<Props> {
+  static ENABLED = [URL_REGEX];
+
+  render() {
+    return (
+      <Frame
+        src={`https://www.figma.com/embed?embed_host=outline&url=${
+          this.props.url
+        }`}
+        title="Figma Embed"
+        border
+      />
+    );
+  }
+}
diff --git a/app/embeds/Figma.test.js b/app/embeds/Figma.test.js
new file mode 100644
index 0000000000..53979d3643
--- /dev/null
+++ b/app/embeds/Figma.test.js
@@ -0,0 +1,24 @@
+/* eslint-disable flowtype/require-valid-file-annotation */
+import embeds from '.';
+
+const { Figma } = embeds;
+
+describe('Figma', () => {
+  const match = Figma.ENABLED[0];
+  test('to be enabled on file link', () => {
+    expect(
+      'https://www.figma.com/file/LKQ4FJ4bTnCSjedbRpk931'.match(match)
+    ).toBeTruthy();
+  });
+
+  test('to be enabled on prototype link', () => {
+    expect(
+      'https://www.figma.com/proto/LKQ4FJ4bTnCSjedbRpk931'.match(match)
+    ).toBeTruthy();
+  });
+
+  test('to not be enabled elsewhere', () => {
+    expect('https://www.figma.com'.match(match)).toBe(null);
+    expect('https://www.figma.com/features'.match(match)).toBe(null);
+  });
+});
diff --git a/app/embeds/Framer.js b/app/embeds/Framer.js
new file mode 100644
index 0000000000..47568c3dc4
--- /dev/null
+++ b/app/embeds/Framer.js
@@ -0,0 +1,17 @@
+// @flow
+import * as React from 'react';
+import Frame from './components/Frame';
+
+const URL_REGEX = new RegExp('^https://framer.cloud/(.*)$');
+
+type Props = {
+  url: string,
+};
+
+export default class Framer extends React.Component<Props> {
+  static ENABLED = [URL_REGEX];
+
+  render() {
+    return <Frame src={this.props.url} title="Framer Embed" border />;
+  }
+}
diff --git a/app/embeds/Framer.test.js b/app/embeds/Framer.test.js
new file mode 100644
index 0000000000..42cbf1d14a
--- /dev/null
+++ b/app/embeds/Framer.test.js
@@ -0,0 +1,15 @@
+/* eslint-disable flowtype/require-valid-file-annotation */
+import embeds from '.';
+
+const { Framer } = embeds;
+
+describe('Framer', () => {
+  const match = Framer.ENABLED[0];
+  test('to be enabled on share link', () => {
+    expect('https://framer.cloud/PVwJO'.match(match)).toBeTruthy();
+  });
+
+  test('to not be enabled on root', () => {
+    expect('https://framer.cloud'.match(match)).toBe(null);
+  });
+});
diff --git a/app/embeds/Gist.js b/app/embeds/Gist.js
new file mode 100644
index 0000000000..56b93fcb78
--- /dev/null
+++ b/app/embeds/Gist.js
@@ -0,0 +1,70 @@
+// @flow
+import * as React from 'react';
+
+const URL_REGEX = new RegExp(
+  '^https://gist.github.com/([a-zd](?:[a-zd]|-(?=[a-zd])){0,38})/(.*)$'
+);
+
+type Props = {
+  url: string,
+};
+
+class Gist extends React.Component<Props> {
+  iframeNode: ?HTMLIFrameElement;
+
+  static ENABLED = [URL_REGEX];
+
+  componentDidMount() {
+    this.updateIframeContent();
+  }
+
+  get id() {
+    const gistUrl = new URL(this.props.url);
+    return gistUrl.pathname.split('/')[2];
+  }
+
+  updateIframeContent() {
+    const id = this.id;
+    const iframe = this.iframeNode;
+    if (!iframe) return;
+
+    // $FlowFixMe
+    let doc = iframe.document;
+    if (iframe.contentDocument) doc = iframe.contentDocument;
+    else if (iframe.contentWindow) doc = iframe.contentWindow.document;
+
+    const gistLink = `https://gist.github.com/${id}.js`;
+    const gistScript = `<script type="text/javascript" src="${
+      gistLink
+    }"></script>`;
+    const styles =
+      '<style>*{ font-size:12px; } body { margin: 0; } .gist .blob-wrapper.data { max-height:150px; overflow:auto; }</style>';
+    const iframeHtml = `<html><head><base target="_parent">${
+      styles
+    }</head><body>${gistScript}</body></html>`;
+
+    doc.open();
+    doc.writeln(iframeHtml);
+    doc.close();
+  }
+
+  render() {
+    const id = this.id;
+
+    return (
+      <iframe
+        ref={ref => {
+          this.iframeNode = ref;
+        }}
+        type="text/html"
+        frameBorder="0"
+        width="100%"
+        height="200px"
+        id={`gist-${id}`}
+        title={`Github Gist (${id})`}
+      />
+    );
+  }
+}
+
+export default Gist;
diff --git a/app/embeds/Gist.test.js b/app/embeds/Gist.test.js
new file mode 100644
index 0000000000..a36c042ceb
--- /dev/null
+++ b/app/embeds/Gist.test.js
@@ -0,0 +1,19 @@
+/* eslint-disable flowtype/require-valid-file-annotation */
+import embeds from '.';
+
+const { Gist } = embeds;
+
+describe('Gist', () => {
+  const match = Gist.ENABLED[0];
+  test('to be enabled on gist link', () => {
+    expect(
+      'https://gist.github.com/wmertens/0b4fd66ca7055fd290ecc4b9d95271a9'.match(
+        match
+      )
+    ).toBeTruthy();
+  });
+
+  test('to not be enabled elsewhere', () => {
+    expect('https://gist.github.com/tommoor'.match(match)).toBe(null);
+  });
+});
diff --git a/app/embeds/InVision.js b/app/embeds/InVision.js
new file mode 100644
index 0000000000..9e0208ac70
--- /dev/null
+++ b/app/embeds/InVision.js
@@ -0,0 +1,19 @@
+// @flow
+import * as React from 'react';
+import Frame from './components/Frame';
+
+const URL_REGEX = new RegExp(
+  '^https://(invis.io/.*)|(projects.invisionapp.com/share/.*)$'
+);
+
+type Props = {
+  url: string,
+};
+
+export default class InVision extends React.Component<Props> {
+  static ENABLED = [URL_REGEX];
+
+  render() {
+    return <Frame src={this.props.url} title="InVision Embed" />;
+  }
+}
diff --git a/app/embeds/InVision.test.js b/app/embeds/InVision.test.js
new file mode 100644
index 0000000000..745af652ac
--- /dev/null
+++ b/app/embeds/InVision.test.js
@@ -0,0 +1,23 @@
+/* eslint-disable flowtype/require-valid-file-annotation */
+import embeds from '.';
+
+const { InVision } = embeds;
+
+describe('InVision', () => {
+  const match = InVision.ENABLED[0];
+  test('to be enabled on shortlink', () => {
+    expect('https://invis.io/69PG07QYQTE'.match(match)).toBeTruthy();
+  });
+
+  test('to be enabled on share', () => {
+    expect(
+      'https://projects.invisionapp.com/share/69PG07QYQTE'.match(match)
+    ).toBeTruthy();
+  });
+
+  test('to not be enabled elsewhere', () => {
+    expect('https://invis.io'.match(match)).toBe(null);
+    expect('https://invisionapp.com'.match(match)).toBe(null);
+    expect('https://projects.invisionapp.com'.match(match)).toBe(null);
+  });
+});
diff --git a/app/embeds/Loom.js b/app/embeds/Loom.js
new file mode 100644
index 0000000000..f644b6ba57
--- /dev/null
+++ b/app/embeds/Loom.js
@@ -0,0 +1,26 @@
+// @flow
+import * as React from 'react';
+import Frame from './components/Frame';
+
+const URL_REGEX = /^https:\/\/(www\.)?useloom.com\/(embed|share)\/(.*)$/;
+
+type Props = {
+  url: string,
+};
+
+export default class Loom extends React.Component<Props> {
+  static ENABLED = [URL_REGEX];
+
+  render() {
+    const normalizedUrl = this.props.url.replace('share', 'embed');
+
+    return (
+      <Frame
+        width="420px"
+        height="235px"
+        src={normalizedUrl}
+        title="Loom Embed"
+      />
+    );
+  }
+}
diff --git a/app/embeds/Loom.test.js b/app/embeds/Loom.test.js
new file mode 100644
index 0000000000..27181466be
--- /dev/null
+++ b/app/embeds/Loom.test.js
@@ -0,0 +1,28 @@
+/* eslint-disable flowtype/require-valid-file-annotation */
+import embeds from '.';
+
+const { Loom } = embeds;
+
+describe('Loom', () => {
+  const match = Loom.ENABLED[0];
+  test('to be enabled on share link', () => {
+    expect(
+      'https://www.useloom.com/share/55327cbb265743f39c2c442c029277e0'.match(
+        match
+      )
+    ).toBeTruthy();
+  });
+
+  test('to be enabled on embed link', () => {
+    expect(
+      'https://www.useloom.com/embed/55327cbb265743f39c2c442c029277e0'.match(
+        match
+      )
+    ).toBeTruthy();
+  });
+
+  test('to not be enabled elsewhere', () => {
+    expect('https://www.useloom.com'.match(match)).toBe(null);
+    expect('https://www.useloom.com/features'.match(match)).toBe(null);
+  });
+});
diff --git a/app/embeds/Lucidchart.js b/app/embeds/Lucidchart.js
new file mode 100644
index 0000000000..9ad0451e7c
--- /dev/null
+++ b/app/embeds/Lucidchart.js
@@ -0,0 +1,26 @@
+// @flow
+import * as React from 'react';
+import Frame from './components/Frame';
+
+const URL_REGEX = /^https:\/\/(www\.)?lucidchart.com\/documents\/(embeddedchart|view)\/([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})(?:\/.*)?$/;
+
+type Props = {
+  url: string,
+  matches: string[],
+};
+
+export default class Lucidchart extends React.Component<Props> {
+  static ENABLED = [URL_REGEX];
+
+  render() {
+    const { matches } = this.props;
+    const chartId = matches[3];
+
+    return (
+      <Frame
+        src={`http://lucidchart.com/documents/embeddedchart/${chartId}`}
+        title="Lucidchart Embed"
+      />
+    );
+  }
+}
diff --git a/app/embeds/Lucidchart.test.js b/app/embeds/Lucidchart.test.js
new file mode 100644
index 0000000000..128a270f5a
--- /dev/null
+++ b/app/embeds/Lucidchart.test.js
@@ -0,0 +1,30 @@
+/* eslint-disable flowtype/require-valid-file-annotation */
+import embeds from '.';
+
+const { Lucidchart } = embeds;
+
+describe('Lucidchart', () => {
+  const match = Lucidchart.ENABLED[0];
+  test('to be enabled on view link', () => {
+    expect(
+      'https://www.lucidchart.com/documents/view/2f4a79cb-7637-433d-8ffb-27cce65a05e7'.match(
+        match
+      )
+    ).toBeTruthy();
+  });
+
+  test('to be enabled on visited link', () => {
+    expect(
+      'https://www.lucidchart.com/documents/view/2f4a79cb-7637-433d-8ffb-27cce65a05e7/0'.match(
+        match
+      )
+    ).toBeTruthy();
+  });
+
+  test('to not be enabled elsewhere', () => {
+    expect('https://lucidchart.com'.match(match)).toBe(null);
+    expect('https://www.lucidchart.com'.match(match)).toBe(null);
+    expect('https://www.lucidchart.com/features'.match(match)).toBe(null);
+    expect('https://www.lucidchart.com/documents/view'.match(match)).toBe(null);
+  });
+});
diff --git a/app/embeds/Marvel.js b/app/embeds/Marvel.js
new file mode 100644
index 0000000000..217ce9f73a
--- /dev/null
+++ b/app/embeds/Marvel.js
@@ -0,0 +1,17 @@
+// @flow
+import * as React from 'react';
+import Frame from './components/Frame';
+
+const URL_REGEX = new RegExp('^https://marvelapp.com/([A-Za-z0-9-]{6})/?$');
+
+type Props = {
+  url: string,
+};
+
+export default class Marvel extends React.Component<Props> {
+  static ENABLED = [URL_REGEX];
+
+  render() {
+    return <Frame src={this.props.url} title="Marvel Embed" border />;
+  }
+}
diff --git a/app/embeds/Marvel.test.js b/app/embeds/Marvel.test.js
new file mode 100644
index 0000000000..9c0218bbb1
--- /dev/null
+++ b/app/embeds/Marvel.test.js
@@ -0,0 +1,16 @@
+/* eslint-disable flowtype/require-valid-file-annotation */
+import embeds from '.';
+
+const { Marvel } = embeds;
+
+describe('Marvel', () => {
+  const match = Marvel.ENABLED[0];
+  test('to be enabled on share link', () => {
+    expect('https://marvelapp.com/75hj91'.match(match)).toBeTruthy();
+  });
+
+  test('to not be enabled elsewhere', () => {
+    expect('https://marvelapp.com'.match(match)).toBe(null);
+    expect('https://marvelapp.com/features'.match(match)).toBe(null);
+  });
+});
diff --git a/app/embeds/ModeAnalytics.js b/app/embeds/ModeAnalytics.js
new file mode 100644
index 0000000000..7ba701d1a7
--- /dev/null
+++ b/app/embeds/ModeAnalytics.js
@@ -0,0 +1,24 @@
+// @flow
+import * as React from 'react';
+import Frame from './components/Frame';
+
+const URL_REGEX = new RegExp(
+  'https://([w.-]+.)?modeanalytics.com/(.*)/reports/(.*)$'
+);
+
+type Props = {
+  url: string,
+};
+
+export default class ModeAnalytics extends React.Component<Props> {
+  static ENABLED = [URL_REGEX];
+
+  render() {
+    // Allow users to paste embed or standard urls and handle them the same
+    const normalizedUrl = this.props.url.replace(/\/embed$/, '');
+
+    return (
+      <Frame src={`${normalizedUrl}/embed`} title="Mode Analytics Embed" />
+    );
+  }
+}
diff --git a/app/embeds/ModeAnalytics.test.js b/app/embeds/ModeAnalytics.test.js
new file mode 100644
index 0000000000..8e14957705
--- /dev/null
+++ b/app/embeds/ModeAnalytics.test.js
@@ -0,0 +1,19 @@
+/* eslint-disable flowtype/require-valid-file-annotation */
+import embeds from '.';
+
+const { ModeAnalytics } = embeds;
+
+describe('ModeAnalytics', () => {
+  const match = ModeAnalytics.ENABLED[0];
+  test('to be enabled on report link', () => {
+    expect(
+      'https://modeanalytics.com/outline/reports/5aca06064f56'.match(match)
+    ).toBeTruthy();
+  });
+
+  test('to not be enabled elsewhere', () => {
+    expect('https://modeanalytics.com'.match(match)).toBe(null);
+    expect('https://modeanalytics.com/outline'.match(match)).toBe(null);
+    expect('https://modeanalytics.com/outline/reports'.match(match)).toBe(null);
+  });
+});
diff --git a/app/embeds/Numeracy.js b/app/embeds/Numeracy.js
new file mode 100644
index 0000000000..d4ad735c95
--- /dev/null
+++ b/app/embeds/Numeracy.js
@@ -0,0 +1,22 @@
+// @flow
+import * as React from 'react';
+import Frame from './components/Frame';
+
+const URL_REGEX = new RegExp('https://([w.-]+.)?numeracy.co/(.*)/(.*)$');
+
+type Props = {
+  url: string,
+};
+
+export default class Numeracy extends React.Component<Props> {
+  static ENABLED = [URL_REGEX];
+
+  render() {
+    // Allow users to paste embed or standard urls and handle them the same
+    const normalizedUrl = this.props.url.replace(/\.embed$/, '');
+
+    return (
+      <Frame src={`${normalizedUrl}.embed`} title="Numeracy Embed" border />
+    );
+  }
+}
diff --git a/app/embeds/Numeracy.test.js b/app/embeds/Numeracy.test.js
new file mode 100644
index 0000000000..56f0539f0d
--- /dev/null
+++ b/app/embeds/Numeracy.test.js
@@ -0,0 +1,22 @@
+/* eslint-disable flowtype/require-valid-file-annotation */
+import embeds from '.';
+
+const { Numeracy } = embeds;
+
+describe('Numeracy', () => {
+  const match = Numeracy.ENABLED[0];
+  test('to be enabled on share link', () => {
+    expect('https://numeracy.co/outline/n8ZIVOC2OS'.match(match)).toBeTruthy();
+  });
+
+  test('to be enabled on embed link', () => {
+    expect(
+      'https://numeracy.co/outline/n8ZIVOC2OS.embed'.match(match)
+    ).toBeTruthy();
+  });
+
+  test('to not be enabled elsewhere', () => {
+    expect('https://numeracy.co'.match(match)).toBe(null);
+    expect('https://numeracy.co/outline'.match(match)).toBe(null);
+  });
+});
diff --git a/app/embeds/RealtimeBoard.js b/app/embeds/RealtimeBoard.js
new file mode 100644
index 0000000000..29f972cd75
--- /dev/null
+++ b/app/embeds/RealtimeBoard.js
@@ -0,0 +1,26 @@
+// @flow
+import * as React from 'react';
+import Frame from './components/Frame';
+
+const URL_REGEX = /^https:\/\/realtimeboard.com\/app\/board\/(.*)$/;
+
+type Props = {
+  url: string,
+  matches: string[],
+};
+
+export default class RealtimeBoard extends React.Component<Props> {
+  static ENABLED = [URL_REGEX];
+
+  render() {
+    const { matches } = this.props;
+    const boardId = matches[1];
+
+    return (
+      <Frame
+        src={`http://realtimeboard.com/app/embed/${boardId}`}
+        title={`RealtimeBoard (${boardId})`}
+      />
+    );
+  }
+}
diff --git a/app/embeds/RealtimeBoard.test.js b/app/embeds/RealtimeBoard.test.js
new file mode 100644
index 0000000000..2c17a42d26
--- /dev/null
+++ b/app/embeds/RealtimeBoard.test.js
@@ -0,0 +1,18 @@
+/* eslint-disable flowtype/require-valid-file-annotation */
+import embeds from '.';
+
+const { RealtimeBoard } = embeds;
+
+describe('RealtimeBoard', () => {
+  const match = RealtimeBoard.ENABLED[0];
+  test('to be enabled on share link', () => {
+    expect(
+      'https://realtimeboard.com/app/board/o9J_k0fwiss='.match(match)
+    ).toBeTruthy();
+  });
+
+  test('to not be enabled elsewhere', () => {
+    expect('https://realtimeboard.com'.match(match)).toBe(null);
+    expect('https://realtimeboard.com/features'.match(match)).toBe(null);
+  });
+});
diff --git a/app/embeds/Spotify.js b/app/embeds/Spotify.js
new file mode 100644
index 0000000000..00d0307ea3
--- /dev/null
+++ b/app/embeds/Spotify.js
@@ -0,0 +1,36 @@
+// @flow
+import * as React from 'react';
+import Frame from './components/Frame';
+
+const URL_REGEX = new RegExp('https?://open.spotify.com/(.*)$');
+
+type Props = {
+  url: string,
+};
+
+export default class Spotify extends React.Component<Props> {
+  static ENABLED = [URL_REGEX];
+
+  get pathname() {
+    try {
+      const parsed = new URL(this.props.url);
+      return parsed.pathname;
+    } catch (err) {
+      return '';
+    }
+  }
+
+  render() {
+    const normalizedPath = this.pathname.replace(/^\/embed/, '/');
+
+    return (
+      <Frame
+        width="300px"
+        height="380px"
+        src={`https://open.spotify.com/embed${normalizedPath}`}
+        title="Spotify Embed"
+        allow="encrypted-media"
+      />
+    );
+  }
+}
diff --git a/app/embeds/Spotify.test.js b/app/embeds/Spotify.test.js
new file mode 100644
index 0000000000..56f65d66b1
--- /dev/null
+++ b/app/embeds/Spotify.test.js
@@ -0,0 +1,29 @@
+/* eslint-disable flowtype/require-valid-file-annotation */
+import embeds from '.';
+
+const { Spotify } = embeds;
+
+describe('Spotify', () => {
+  const match = Spotify.ENABLED[0];
+  test('to be enabled on song link', () => {
+    expect(
+      'https://open.spotify.com/track/29G1ScCUhgjgI0H72qN4DE?si=DxjEUxV2Tjmk6pSVckPDRg'.match(
+        match
+      )
+    ).toBeTruthy();
+  });
+
+  test('to be enabled on playlist link', () => {
+    expect(
+      'https://open.spotify.com/user/spotify/playlist/29G1ScCUhgjgI0H72qN4DE?si=DxjEUxV2Tjmk6pSVckPDRg'.match(
+        match
+      )
+    ).toBeTruthy();
+  });
+
+  test('to not be enabled elsewhere', () => {
+    expect('https://spotify.com'.match(match)).toBe(null);
+    expect('https://open.spotify.com'.match(match)).toBe(null);
+    expect('https://www.spotify.com'.match(match)).toBe(null);
+  });
+});
diff --git a/app/embeds/Trello.js b/app/embeds/Trello.js
new file mode 100644
index 0000000000..0c3bad69d6
--- /dev/null
+++ b/app/embeds/Trello.js
@@ -0,0 +1,39 @@
+// @flow
+import * as React from 'react';
+import Frame from './components/Frame';
+
+const URL_REGEX = /^https:\/\/trello.com\/(c|b)\/(.*)$/;
+
+type Props = {
+  url: string,
+  matches: string[],
+};
+
+export default class Trello extends React.Component<Props> {
+  static ENABLED = [URL_REGEX];
+
+  render() {
+    const { matches } = this.props;
+    const objectId = matches[2];
+
+    if (matches[1] === 'c') {
+      return (
+        <Frame
+          width="316px"
+          height="158px"
+          src={`https://trello.com/embed/card?id=${objectId}`}
+          title={`Trello Card (${objectId})`}
+        />
+      );
+    }
+
+    return (
+      <Frame
+        width="248px"
+        height="185px"
+        src={`https://trello.com/embed/board?id=${objectId}`}
+        title={`Trello Board (${objectId})`}
+      />
+    );
+  }
+}
diff --git a/app/embeds/Typeform.js b/app/embeds/Typeform.js
new file mode 100644
index 0000000000..92e6c79e7b
--- /dev/null
+++ b/app/embeds/Typeform.js
@@ -0,0 +1,19 @@
+// @flow
+import * as React from 'react';
+import Frame from './components/Frame';
+
+const URL_REGEX = new RegExp(
+  '^https://([A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?).typeform.com/to/(.*)$'
+);
+
+type Props = {
+  url: string,
+};
+
+export default class Typeform extends React.Component<Props> {
+  static ENABLED = [URL_REGEX];
+
+  render() {
+    return <Frame src={this.props.url} title="Typeform Embed" />;
+  }
+}
diff --git a/app/embeds/Typeform.test.js b/app/embeds/Typeform.test.js
new file mode 100644
index 0000000000..cb2196af41
--- /dev/null
+++ b/app/embeds/Typeform.test.js
@@ -0,0 +1,19 @@
+/* eslint-disable flowtype/require-valid-file-annotation */
+import embeds from '.';
+
+const { Typeform } = embeds;
+
+describe('Typeform', () => {
+  const match = Typeform.ENABLED[0];
+  test('to be enabled on share link', () => {
+    expect(
+      'https://beardyman.typeform.com/to/zvlr4L'.match(match)
+    ).toBeTruthy();
+  });
+
+  test('to not be enabled elsewhere', () => {
+    expect('https://www.typeform.com'.match(match)).toBe(null);
+    expect('https://typeform.com/to/zvlr4L'.match(match)).toBe(null);
+    expect('https://typeform.com/features'.match(match)).toBe(null);
+  });
+});
diff --git a/app/embeds/Vimeo.js b/app/embeds/Vimeo.js
new file mode 100644
index 0000000000..472a01ee3a
--- /dev/null
+++ b/app/embeds/Vimeo.js
@@ -0,0 +1,28 @@
+// @flow
+import * as React from 'react';
+import Frame from './components/Frame';
+
+const URL_REGEX = /(http|https)?:\/\/(www\.)?vimeo.com\/(?:channels\/(?:\w+\/)?|groups\/([^\/]*)\/videos\/|)(\d+)(?:|\/\?)/;
+
+type Props = {
+  url: string,
+  matches: string[],
+};
+
+export default class Vimeo extends React.Component<Props> {
+  static ENABLED = [URL_REGEX];
+
+  render() {
+    const { matches } = this.props;
+    const videoId = matches[4];
+
+    return (
+      <Frame
+        width="420px"
+        height="235px"
+        src={`http://player.vimeo.com/video/${videoId}?byline=0`}
+        title={`Vimeo Embed (${videoId})`}
+      />
+    );
+  }
+}
diff --git a/app/embeds/Vimeo.test.js b/app/embeds/Vimeo.test.js
new file mode 100644
index 0000000000..08bf3fd20b
--- /dev/null
+++ b/app/embeds/Vimeo.test.js
@@ -0,0 +1,20 @@
+/* eslint-disable flowtype/require-valid-file-annotation */
+import embeds from '.';
+
+const { Vimeo } = embeds;
+
+describe('Vimeo', () => {
+  const match = Vimeo.ENABLED[0];
+  test('to be enabled on video link', () => {
+    expect('https://vimeo.com/265045525'.match(match)).toBeTruthy();
+  });
+
+  test('to not be enabled elsewhere', () => {
+    expect('https://vimeo.com'.match(match)).toBe(null);
+    expect('https://www.vimeo.com'.match(match)).toBe(null);
+    expect('https://vimeo.com/upgrade'.match(match)).toBe(null);
+    expect('https://vimeo.com/features/video-marketing'.match(match)).toBe(
+      null
+    );
+  });
+});
diff --git a/app/embeds/YouTube.js b/app/embeds/YouTube.js
new file mode 100644
index 0000000000..cb1c9d6dc6
--- /dev/null
+++ b/app/embeds/YouTube.js
@@ -0,0 +1,28 @@
+// @flow
+import * as React from 'react';
+import Frame from './components/Frame';
+
+const URL_REGEX = /(?:https?:\/\/)?(?:www\.)?youtu\.?be(?:\.com)?\/?.*(?:watch|embed)?(?:.*v=|v\/|\/)([a-zA-Z0-9_-]{11})$/i;
+
+type Props = {
+  url: string,
+  matches: string[],
+};
+
+export default class YouTube extends React.Component<Props> {
+  static ENABLED = [URL_REGEX];
+
+  render() {
+    const { matches } = this.props;
+    const videoId = matches[1];
+
+    return (
+      <Frame
+        width="420px"
+        height="235px"
+        src={`https://www.youtube.com/embed/${videoId}?modestbranding=1`}
+        title={`YouTube (${videoId})`}
+      />
+    );
+  }
+}
diff --git a/app/embeds/YouTube.test.js b/app/embeds/YouTube.test.js
new file mode 100644
index 0000000000..9fa3442e2d
--- /dev/null
+++ b/app/embeds/YouTube.test.js
@@ -0,0 +1,33 @@
+/* eslint-disable flowtype/require-valid-file-annotation */
+import embeds from '.';
+
+const { YouTube } = embeds;
+
+describe('YouTube', () => {
+  const match = YouTube.ENABLED[0];
+  test('to be enabled on video link', () => {
+    expect(
+      'https://www.youtube.com/watch?v=dQw4w9WgXcQ'.match(match)
+    ).toBeTruthy();
+  });
+
+  test('to be enabled on embed link', () => {
+    expect(
+      'https://www.youtube.com/embed?v=dQw4w9WgXcQ'.match(match)
+    ).toBeTruthy();
+  });
+
+  test('to be enabled on shortlink', () => {
+    expect('https://youtu.be/dQw4w9WgXcQ'.match(match)).toBeTruthy();
+  });
+
+  test('to not be enabled elsewhere', () => {
+    expect('https://youtu.be'.match(match)).toBe(null);
+    expect('https://youtube.com'.match(match)).toBe(null);
+    expect('https://www.youtube.com'.match(match)).toBe(null);
+    expect('https://www.youtube.com/logout'.match(match)).toBe(null);
+    expect('https://www.youtube.com/feed/subscriptions'.match(match)).toBe(
+      null
+    );
+  });
+});
diff --git a/app/embeds/components/Frame.js b/app/embeds/components/Frame.js
new file mode 100644
index 0000000000..2564ddd11d
--- /dev/null
+++ b/app/embeds/components/Frame.js
@@ -0,0 +1,82 @@
+// @flow
+import * as React from 'react';
+import styled from 'styled-components';
+
+type Props = {
+  src?: string,
+  border?: boolean,
+  forwardedRef: *,
+  width?: string,
+  height?: string,
+};
+
+type State = {
+  isLoaded: boolean,
+};
+
+class Frame extends React.Component<Props, State> {
+  mounted: boolean;
+
+  state = { isLoaded: false };
+
+  componentDidMount() {
+    this.mounted = true;
+    setImmediate(this.loadIframe);
+  }
+
+  componentWillUnmount() {
+    this.mounted = false;
+  }
+
+  loadIframe = () => {
+    if (!this.mounted) return;
+    this.setState({ isLoaded: true });
+  };
+
+  render() {
+    const {
+      border,
+      width = '100%',
+      height = '400',
+      forwardedRef,
+      ...rest
+    } = this.props;
+    const Component = border ? Iframe : 'iframe';
+
+    return (
+      <Rounded width={width} height={height}>
+        {this.state.isLoaded && (
+          <Component
+            ref={forwardedRef}
+            sandbox="allow-same-origin allow-scripts allow-popups allow-forms"
+            width={width}
+            height={height}
+            type="text/html"
+            frameBorder="0"
+            title="embed"
+            allowFullScreen
+            {...rest}
+          />
+        )}
+      </Rounded>
+    );
+  }
+}
+
+const Rounded = styled.div`
+  border-radius: 3px;
+  overflow: hidden;
+  width: ${props => props.width};
+  height: ${props => props.height};
+`;
+
+const Iframe = styled.iframe`
+  border: 1px solid;
+  border-color: #ddd #ddd #ccc;
+  border-radius: 3px;
+`;
+
+// $FlowIssue - https://github.com/facebook/flow/issues/6103
+export default React.forwardRef((props, ref) => (
+  <Frame {...props} forwardedRef={ref} />
+));
diff --git a/app/embeds/index.js b/app/embeds/index.js
new file mode 100644
index 0000000000..c3295cf547
--- /dev/null
+++ b/app/embeds/index.js
@@ -0,0 +1,38 @@
+// @flow
+import Airtable from './Airtable';
+import Codepen from './Codepen';
+import Figma from './Figma';
+import Framer from './Framer';
+import Gist from './Gist';
+import InVision from './InVision';
+import Loom from './Loom';
+import Lucidchart from './Lucidchart';
+import Marvel from './Marvel';
+import ModeAnalytics from './ModeAnalytics';
+import Numeracy from './Numeracy';
+import RealtimeBoard from './RealtimeBoard';
+import Spotify from './Spotify';
+import Trello from './Trello';
+import Typeform from './Typeform';
+import Vimeo from './Vimeo';
+import YouTube from './YouTube';
+
+export default {
+  Airtable,
+  Codepen,
+  Figma,
+  Framer,
+  Gist,
+  InVision,
+  Loom,
+  Lucidchart,
+  Marvel,
+  ModeAnalytics,
+  Numeracy,
+  RealtimeBoard,
+  Spotify,
+  Trello,
+  Typeform,
+  Vimeo,
+  YouTube,
+};
diff --git a/app/menus/DocumentMenu.js b/app/menus/DocumentMenu.js
index ba4de3aaca..6bb84e3402 100644
--- a/app/menus/DocumentMenu.js
+++ b/app/menus/DocumentMenu.js
@@ -18,6 +18,7 @@ type Props = {
   document: Document,
   className: string,
   showPrint?: boolean,
+  showToggleEmbeds?: boolean,
 };
 
 @observer
@@ -75,7 +76,14 @@ class DocumentMenu extends React.Component<Props> {
   };
 
   render() {
-    const { document, label, className, showPrint, auth } = this.props;
+    const {
+      document,
+      label,
+      className,
+      showPrint,
+      showToggleEmbeds,
+      auth,
+    } = this.props;
     const canShareDocuments = auth.team && auth.team.sharing;
 
     return (
@@ -106,6 +114,19 @@ class DocumentMenu extends React.Component<Props> {
                 Share link…
               </DropdownMenuItem>
             )}
+            {showToggleEmbeds && (
+              <React.Fragment>
+                {document.embedsDisabled ? (
+                  <DropdownMenuItem onClick={document.enableEmbeds}>
+                    Enable embeds
+                  </DropdownMenuItem>
+                ) : (
+                  <DropdownMenuItem onClick={document.disableEmbeds}>
+                    Disable embeds
+                  </DropdownMenuItem>
+                )}
+              </React.Fragment>
+            )}
             <hr />
             <DropdownMenuItem onClick={this.handleDocumentHistory}>
               Document history
diff --git a/app/models/Document.js b/app/models/Document.js
index 93f907e9e4..e00c970808 100644
--- a/app/models/Document.js
+++ b/app/models/Document.js
@@ -1,5 +1,5 @@
 // @flow
-import { action, set, computed } from 'mobx';
+import { action, set, computed, observable } from 'mobx';
 import invariant from 'invariant';
 
 import { client } from 'utils/ApiClient';
@@ -42,6 +42,7 @@ export default class Document extends BaseModel {
   shareUrl: ?string;
   views: number;
   revision: number;
+  @observable embedsDisabled: ?boolean;
 
   constructor(data?: Object = {}, store: *) {
     super(data, store);
@@ -143,6 +144,16 @@ export default class Document extends BaseModel {
     }
   };
 
+  @action
+  enableEmbeds = () => {
+    this.embedsDisabled = false;
+  };
+
+  @action
+  disableEmbeds = () => {
+    this.embedsDisabled = true;
+  };
+
   @action
   star = async () => {
     this.starred = true;
diff --git a/app/models/Team.js b/app/models/Team.js
index 5e79ff0c68..5706396ba0 100644
--- a/app/models/Team.js
+++ b/app/models/Team.js
@@ -8,6 +8,7 @@ class Team extends BaseModel {
   slackConnected: boolean;
   googleConnected: boolean;
   sharing: boolean;
+  documentEmbeds: boolean;
   subdomain: ?string;
   url: string;
 }
diff --git a/app/scenes/Document/Document.js b/app/scenes/Document/Document.js
index de3ba8ae58..d5179f99ca 100644
--- a/app/scenes/Document/Document.js
+++ b/app/scenes/Document/Document.js
@@ -277,7 +277,8 @@ class DocumentScene extends React.Component<Props> {
   };
 
   render() {
-    const { location, match } = this.props;
+    const { location, auth, match } = this.props;
+    const team = auth.team;
     const Editor = this.editorComponent;
     const document = this.document;
     const revision = this.revision;
@@ -296,7 +297,7 @@ class DocumentScene extends React.Component<Props> {
       );
     }
 
-    if (!document || !Editor) {
+    if (!document || !team || !Editor) {
       return (
         <Container column auto>
           <PageTitle title={location.state ? location.state.title : ''} />
@@ -307,6 +308,8 @@ class DocumentScene extends React.Component<Props> {
       );
     }
 
+    const embedsDisabled = document.embedsDisabled || !team.documentEmbeds;
+
     return (
       <ErrorBoundary>
         <Container
@@ -359,10 +362,12 @@ class DocumentScene extends React.Component<Props> {
             )}
             <MaxWidth column auto>
               <Editor
+                key={embedsDisabled ? 'embeds-disabled' : 'embeds-enabled'}
                 titlePlaceholder="Start with a title…"
                 bodyPlaceholder="…the rest is your canvas"
                 defaultValue={revision ? revision.text : document.text}
                 pretitle={document.emoji}
+                disableEmbeds={embedsDisabled}
                 onImageUploadStart={this.onImageUploadStart}
                 onImageUploadStop={this.onImageUploadStop}
                 onSearchLink={this.onSearchLink}
diff --git a/app/scenes/Document/components/Header.js b/app/scenes/Document/components/Header.js
index 2b9c4668a4..517d032a03 100644
--- a/app/scenes/Document/components/Header.js
+++ b/app/scenes/Document/components/Header.js
@@ -95,6 +95,7 @@ class Header extends React.Component<Props> {
       auth,
     } = this.props;
     const canShareDocuments = auth.team && auth.team.sharing;
+    const canToggleEmbeds = auth.team && auth.team.documentEmbeds;
 
     return (
       <Actions
@@ -168,7 +169,11 @@ class Header extends React.Component<Props> {
           )}
           {!isEditing && (
             <Action>
-              <DocumentMenu document={document} showPrint />
+              <DocumentMenu
+                document={document}
+                showToggleEmbeds={canToggleEmbeds}
+                showPrint
+              />
             </Action>
           )}
           {!isEditing &&
diff --git a/app/scenes/Settings/Security.js b/app/scenes/Settings/Security.js
index 35f31dcc76..d1a96f6c9b 100644
--- a/app/scenes/Settings/Security.js
+++ b/app/scenes/Settings/Security.js
@@ -21,10 +21,12 @@ class Security extends React.Component<Props> {
   form: ?HTMLFormElement;
 
   @observable sharing: boolean;
+  @observable documentEmbeds: boolean;
 
   componentDidMount() {
     const { auth } = this.props;
     if (auth.team) {
+      this.documentEmbeds = auth.team.documentEmbeds;
       this.sharing = auth.team.sharing;
     }
   }
@@ -34,13 +36,18 @@ class Security extends React.Component<Props> {
 
     await this.props.auth.updateTeam({
       sharing: this.sharing,
+      documentEmbeds: this.documentEmbeds,
     });
     this.props.ui.showToast('Settings saved', 'success');
   };
 
   handleChange = (ev: SyntheticInputEvent<*>) => {
-    if (ev.target.name === 'sharing') {
-      this.sharing = ev.target.checked;
+    switch (ev.target.name) {
+      case 'sharing':
+        return (this.sharing = ev.target.checked);
+      case 'documentEmbeds':
+        return (this.documentEmbeds = ev.target.checked);
+      default:
     }
   };
 
@@ -56,18 +63,25 @@ class Security extends React.Component<Props> {
         <PageTitle title="Security" />
         <h1>Security</h1>
         <HelpText>
-          Settings that impact the access, security and privacy of your
+          Settings that impact the access, security and content of your
           knowledgebase.
         </HelpText>
 
         <form onSubmit={this.handleSubmit} ref={ref => (this.form = ref)}>
           <Checkbox
-            label="Allow sharing documents"
+            label="Public document sharing"
             name="sharing"
             checked={this.sharing}
             onChange={this.handleChange}
             note="When enabled documents can be shared publicly by any team member"
           />
+          <Checkbox
+            label="Rich service embeds"
+            name="documentEmbeds"
+            checked={this.documentEmbeds}
+            onChange={this.handleChange}
+            note="Convert links to supported services into rich embeds within your documents"
+          />
           <Button type="submit" disabled={isSaving || !this.isValid}>
             {isSaving ? 'Saving…' : 'Save'}
           </Button>
diff --git a/package.json b/package.json
index 798ec503a6..65bed4e386 100644
--- a/package.json
+++ b/package.json
@@ -159,7 +159,7 @@
     "react-waypoint": "^7.3.1",
     "redis": "^2.6.2",
     "redis-lock": "^0.1.0",
-    "rich-markdown-editor": "^6.1.1",
+    "rich-markdown-editor": "^7.0.0-1",
     "safestart": "1.1.0",
     "sequelize": "4.28.6",
     "sequelize-cli": "^2.7.0",
diff --git a/server/api/team.js b/server/api/team.js
index 4b8e4a6a9b..ec5f268f76 100644
--- a/server/api/team.js
+++ b/server/api/team.js
@@ -11,7 +11,7 @@ const { authorize } = policy;
 const router = new Router();
 
 router.post('team.update', auth(), async ctx => {
-  const { name, avatarUrl, subdomain, sharing } = ctx.body;
+  const { name, avatarUrl, subdomain, sharing, documentEmbeds } = ctx.body;
   const endpoint = publicS3Endpoint();
 
   const user = ctx.state.user;
@@ -24,6 +24,7 @@ router.post('team.update', auth(), async ctx => {
 
   if (name) team.name = name;
   if (sharing !== undefined) team.sharing = sharing;
+  if (documentEmbeds !== undefined) team.documentEmbeds = documentEmbeds;
   if (avatarUrl && avatarUrl.startsWith(`${endpoint}/uploads/${user.id}`)) {
     team.avatarUrl = avatarUrl;
   }
diff --git a/server/migrations/20181215192422-document-embeds.js b/server/migrations/20181215192422-document-embeds.js
new file mode 100644
index 0000000000..e7d14f14c1
--- /dev/null
+++ b/server/migrations/20181215192422-document-embeds.js
@@ -0,0 +1,12 @@
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.addColumn('teams', 'documentEmbeds', {
+      type: Sequelize.BOOLEAN,
+      allowNull: false,
+      defaultValue: true
+    });
+  },
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.removeColumn('teams', 'documentEmbeds');
+  }
+}
\ No newline at end of file
diff --git a/server/models/Team.js b/server/models/Team.js
index d4e1868c4e..07a4255f93 100644
--- a/server/models/Team.js
+++ b/server/models/Team.js
@@ -44,6 +44,11 @@ const Team = sequelize.define(
     googleId: { type: DataTypes.STRING, allowNull: true },
     avatarUrl: { type: DataTypes.STRING, allowNull: true },
     sharing: { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: true },
+    documentEmbeds: {
+      type: DataTypes.BOOLEAN,
+      allowNull: false,
+      defaultValue: true,
+    },
     slackData: DataTypes.JSONB,
   },
   {
diff --git a/server/presenters/team.js b/server/presenters/team.js
index 7180d5aa61..6658e06073 100644
--- a/server/presenters/team.js
+++ b/server/presenters/team.js
@@ -11,6 +11,7 @@ function present(ctx: Object, team: Team) {
     slackConnected: !!team.slackId,
     googleConnected: !!team.googleId,
     sharing: team.sharing,
+    documentEmbeds: team.documentEmbeds,
     subdomain: team.subdomain,
     url: team.url,
   };
diff --git a/yarn.lock b/yarn.lock
index 3227483088..345670f916 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8986,9 +8986,9 @@ retry-axios@0.3.2, retry-axios@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/retry-axios/-/retry-axios-0.3.2.tgz#5757c80f585b4cc4c4986aa2ffd47a60c6d35e13"
 
-rich-markdown-editor@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/rich-markdown-editor/-/rich-markdown-editor-6.1.1.tgz#f3be0e5f43a804cc6c32b3cc6810907080494b54"
+rich-markdown-editor@^7.0.0-1:
+  version "7.0.0-1"
+  resolved "https://registry.yarnpkg.com/rich-markdown-editor/-/rich-markdown-editor-7.0.0-1.tgz#e587894609cedaacc7e5c35cfd278799ff420f61"
   dependencies:
     "@tommoor/slate-drop-or-paste-images" "^0.8.1"
     babel-plugin-transform-async-to-generator "^6.24.1"
@@ -9009,7 +9009,7 @@ rich-markdown-editor@^6.1.1:
     slate-collapse-on-escape "^0.6.1"
     slate-edit-code "^0.15.5"
     slate-edit-list "^0.11.3"
-    slate-md-serializer "^5.2.0"
+    slate-md-serializer "^5.2.2"
     slate-paste-linkify "^0.5.1"
     slate-plain-serializer "0.5.4"
     slate-prism "^0.5.0"
@@ -9381,9 +9381,9 @@ slate-edit-list@^0.11.3:
   version "0.11.3"
   resolved "https://registry.yarnpkg.com/slate-edit-list/-/slate-edit-list-0.11.3.tgz#d27ff2ff93a83bef49131a6a44b87a9558c9d44c"
 
-slate-md-serializer@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/slate-md-serializer/-/slate-md-serializer-5.2.0.tgz#bc45a338f8cdc483f9b501ab8543cb920992376f"
+slate-md-serializer@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/slate-md-serializer/-/slate-md-serializer-5.2.2.tgz#86003e476746af3361d6ccf61c1cb41e9494eb6e"
   dependencies:
     hashtag-regex "^2.0.0"