diff --git a/webapp/components/Editor/ContentViewer.vue b/webapp/components/Editor/ContentViewer.vue
index d4acacb09..156e09d91 100644
--- a/webapp/components/Editor/ContentViewer.vue
+++ b/webapp/components/Editor/ContentViewer.vue
@@ -5,7 +5,7 @@
 <script>
 import defaultExtensions from './defaultExtensions.js'
 import Hashtag from './nodes/Hashtag.js'
-import { Editor, EditorContent } from 'tiptap'
+import { Editor, EditorContent } from '@tiptap/vue-2'
 
 export default {
   name: 'ContentViewer',
diff --git a/webapp/components/Editor/Editor.vue b/webapp/components/Editor/Editor.vue
index 8bc0a04d3..d23155302 100644
--- a/webapp/components/Editor/Editor.vue
+++ b/webapp/components/Editor/Editor.vue
@@ -21,8 +21,8 @@
 </template>
 
 <script>
-import { Editor, EditorContent } from 'tiptap'
-import { History } from 'tiptap-extensions'
+import { Editor, EditorContent } from '@tiptap/vue-2'
+import { History } from '@tiptap/extension-history'
 import linkify from 'linkify-it'
 import { replace, build } from 'xregexp/xregexp-all.js'
 
diff --git a/webapp/components/Editor/defaultExtensions.js b/webapp/components/Editor/defaultExtensions.js
index 63cf8c73f..dc579523b 100644
--- a/webapp/components/Editor/defaultExtensions.js
+++ b/webapp/components/Editor/defaultExtensions.js
@@ -5,17 +5,15 @@ import Strike from '~/components/Editor/marks/Strike'
 import Italic from '~/components/Editor/marks/Italic'
 import Bold from '~/components/Editor/marks/Bold'
 import EmbedQuery from '~/graphql/EmbedQuery.js'
-import {
-  Heading,
-  HardBreak,
-  Blockquote,
-  ListItem,
-  BulletList,
-  OrderedList,
-  HorizontalRule,
-  Placeholder,
-  Underline,
-} from 'tiptap-extensions'
+import { Heading } from '@tiptap/extension-heading'
+import { HardBreak } from '@tiptap/extension-hard-break'
+import { Blockquote } from '@tiptap/extension-blockquote'
+import { ListItem } from '@tiptap/extension-list-item'
+import { BulletList } from '@tiptap/extension-bullet-list'
+import { OrderedList } from '@tiptap/extension-ordered-list'
+import { HorizontalRule } from '@tiptap/extension-horizontal-rule'
+import { Placeholder } from '@tiptap/extension-placeholder'
+import { Underline } from '@tiptap/extension-underline'
 
 export default function defaultExtensions(component) {
   const { placeholder, $t, $apollo } = component
diff --git a/webapp/components/Editor/defaultExtensions.spec.js b/webapp/components/Editor/defaultExtensions.spec.js
index 97d50b883..19c94db8c 100644
--- a/webapp/components/Editor/defaultExtensions.spec.js
+++ b/webapp/components/Editor/defaultExtensions.spec.js
@@ -1,5 +1,5 @@
 import defaultExtensions from './defaultExtensions.js'
-import { Editor } from 'tiptap'
+import { Editor } from '@tiptap/vue-2'
 
 let content
 let createEditor
diff --git a/webapp/components/Editor/marks/Bold.js b/webapp/components/Editor/marks/Bold.js
index f803ff9cc..b8adceb58 100644
--- a/webapp/components/Editor/marks/Bold.js
+++ b/webapp/components/Editor/marks/Bold.js
@@ -1,4 +1,4 @@
-import { Bold as TipTapBold } from 'tiptap-extensions'
+import { Bold as TipTapBold } from '@tiptap/extension-bold'
 
 export default class Bold extends TipTapBold {
   pasteRules() {
diff --git a/webapp/components/Editor/marks/Italic.js b/webapp/components/Editor/marks/Italic.js
index 07493bd39..8214e492e 100644
--- a/webapp/components/Editor/marks/Italic.js
+++ b/webapp/components/Editor/marks/Italic.js
@@ -1,4 +1,4 @@
-import { Italic as TipTapItalic } from 'tiptap-extensions'
+import { Italic as TipTapItalic } from '@tiptap/extension-italic'
 
 export default class Italic extends TipTapItalic {
   pasteRules() {
diff --git a/webapp/components/Editor/marks/Strike.js b/webapp/components/Editor/marks/Strike.js
index 260ce6a0a..abe782e7f 100644
--- a/webapp/components/Editor/marks/Strike.js
+++ b/webapp/components/Editor/marks/Strike.js
@@ -1,4 +1,4 @@
-import { Strike as TipTapStrike } from 'tiptap-extensions'
+import { Strike as TipTapStrike } from '@tiptap/extension-strike'
 
 export default class Strike extends TipTapStrike {
   pasteRules() {
diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index 0cbc4d7ad..dac7ff9ba 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -1,4 +1,4 @@
-import { Node } from 'tiptap'
+import { Node } from '@tiptap/vue-2'
 import pasteRule from '../commands/pasteRule'
 import { compileToFunctions } from 'vue-template-compiler'
 import Vue from 'vue'
diff --git a/webapp/components/Editor/nodes/Hashtag.js b/webapp/components/Editor/nodes/Hashtag.js
index d591c3e30..3e2c6483a 100644
--- a/webapp/components/Editor/nodes/Hashtag.js
+++ b/webapp/components/Editor/nodes/Hashtag.js
@@ -1,4 +1,4 @@
-import { Mention as TipTapMention } from 'tiptap-extensions'
+import { Mention as TipTapMention } from '@tiptap/extension-mention'
 
 export default class Hashtag extends TipTapMention {
   get name() {
diff --git a/webapp/components/Editor/nodes/LegacyEmbed.js b/webapp/components/Editor/nodes/LegacyEmbed.js
index 0d308a356..befb9b91b 100644
--- a/webapp/components/Editor/nodes/LegacyEmbed.js
+++ b/webapp/components/Editor/nodes/LegacyEmbed.js
@@ -1,4 +1,4 @@
-import { Node } from 'tiptap'
+import { Node } from '@tiptap/vue-2'
 import pasteRule from '../commands/pasteRule'
 import { compileToFunctions } from 'vue-template-compiler'
 import Vue from 'vue'
diff --git a/webapp/components/Editor/nodes/Link.js b/webapp/components/Editor/nodes/Link.js
index 3850a063b..d42ccf509 100644
--- a/webapp/components/Editor/nodes/Link.js
+++ b/webapp/components/Editor/nodes/Link.js
@@ -1,4 +1,4 @@
-import { Link as TipTapLink } from 'tiptap-extensions'
+import { Link as TipTapLink } from '@tiptap/extension-link'
 
 export default class Link extends TipTapLink {
   pasteRules({ type }) {
diff --git a/webapp/components/Editor/nodes/Mention.js b/webapp/components/Editor/nodes/Mention.js
index fa1555877..8fdcb0f08 100644
--- a/webapp/components/Editor/nodes/Mention.js
+++ b/webapp/components/Editor/nodes/Mention.js
@@ -1,4 +1,4 @@
-import { Mention as TipTapMention } from 'tiptap-extensions'
+import { Mention as TipTapMention } from '@tiptap/extension-mention'
 
 export default class Mention extends TipTapMention {
   get name() {
diff --git a/webapp/components/Editor/plugins/eventHandler.js b/webapp/components/Editor/plugins/eventHandler.js
index 1d823491a..e992b9a05 100644
--- a/webapp/components/Editor/plugins/eventHandler.js
+++ b/webapp/components/Editor/plugins/eventHandler.js
@@ -1,4 +1,5 @@
-import { Extension, Plugin } from 'tiptap'
+import { Extension } from '@tiptap/core'
+import { Plugin } from '@tiptap/pm/state'
 // import { Slice, Fragment } from 'prosemirror-model'
 
 export default class EventHandler extends Extension {