diff --git a/src/extensions/CollaborationCaret.ts b/src/extensions/CollaborationCaret.ts
index 707289bb261..47f7afa22fe 100644
--- a/src/extensions/CollaborationCaret.ts
+++ b/src/extensions/CollaborationCaret.ts
@@ -5,6 +5,7 @@
 
 import { t } from '@nextcloud/l10n'
 import { CollaborationCaret as TiptapCollaborationCaret } from '@tiptap/extension-collaboration-caret'
+import { yCursorPlugin } from '@tiptap/y-tiptap'
 
 export interface AwarenessUser {
 	color: string
@@ -97,6 +98,16 @@ const CollaborationCaret = TiptapCollaborationCaret.extend({
 			})
 		}
 	},
+
+	// Override to stop tiptap from setting its own default user
+	addProseMirrorPlugins() {
+		return [
+			yCursorPlugin(this.options.provider.awareness, {
+				cursorBuilder: this.options.render,
+				selectionBuilder: this.options.selectionRender,
+			}),
+		]
+	},
 })
 
 export default CollaborationCaret