diff --git a/src/components/Editor.js b/src/components/Editor.js
index cb0bdcb6d20..197096e976d 100644
--- a/src/components/Editor.js
+++ b/src/components/Editor.js
@@ -7,7 +7,7 @@ import { defineComponent, h, nextTick, ref, watch } from 'vue'
 import Editor from './Editor.vue'
 
 export default defineComponent({
-	emits: ['focus', 'ready'],
+	emits: ['focus', 'ready', 'create:content', 'update:content'],
 	props: Editor.props,
 	setup(props, { attrs, emit, slots }) {
 		const reloading = ref(false)
@@ -27,6 +27,8 @@ export default defineComponent({
 					focus: () => emit('focus'),
 					ready: () => emit('ready'),
 					reload: () => (reloading.value = true),
+					'create:content': (content) => emit('create:content', content),
+					'update:content': (content) => emit('update:content', content),
 				},
 				scopedSlots: slots,
 			})
diff --git a/src/components/Editor.vue b/src/components/Editor.vue
index d717ca0608f..ce83a685997 100644
--- a/src/components/Editor.vue
+++ b/src/components/Editor.vue
@@ -937,7 +937,6 @@ export default defineComponent({
 		resolved() {
 			localStorage.removeItem(this.indexedDbConflictKey)
 			this.indexedDbConflictContent = ''
-			this.$emit('resolved')
 		},
 	},
 })
diff --git a/src/editor.js b/src/editor.js
index 65501b7c059..a9bc13a3b0a 100644
--- a/src/editor.js
+++ b/src/editor.js
@@ -325,6 +325,13 @@ window.OCA.Text.createEditor = async function ({
 							active: true,
 							autofocus,
 						},
+						on: {
+							ready: () => vm.$emit('ready'),
+							'create:content': (content) =>
+								vm.$emit('create:content', content),
+							'update:content': (content) =>
+								vm.$emit('update:content', content),
+						},
 						scopedSlots,
 					})
 				: h(MarkdownContentEditor, {