diff --git a/docs/src/demos/Examples/CollaborativeEditing/index.vue b/docs/src/demos/Examples/CollaborativeEditing/index.vue
index 3c7f1248..30b0e41a 100644
--- a/docs/src/demos/Examples/CollaborativeEditing/index.vue
+++ b/docs/src/demos/Examples/CollaborativeEditing/index.vue
@@ -82,7 +82,7 @@ export default {
 
     this.editor = new Editor({
       extensions: [
-        ...defaultExtensions(),
+        ...defaultExtensions().filter(extension => extension.config.name !== 'history'),
         Collaboration.configure({
           provider,
         }),
diff --git a/packages/extension-collaboration/src/index.ts b/packages/extension-collaboration/src/index.ts
index 976d1adb..6249c4bb 100644
--- a/packages/extension-collaboration/src/index.ts
+++ b/packages/extension-collaboration/src/index.ts
@@ -26,9 +26,9 @@ const Collaboration = Extension.create({
 
   addKeyboardShortcuts() {
     return {
-      'Mod-z': undo,
-      'Mod-y': redo,
-      'Mod-Shift-z': redo,
+      'Mod-z': () => undo(this.editor.state),
+      'Mod-y': () => redo(this.editor.state),
+      'Mod-Shift-z': () => redo(this.editor.state),
     }
   },
 
diff --git a/packages/extension-history/src/index.ts b/packages/extension-history/src/index.ts
index 6f389f2e..b5d48acf 100644
--- a/packages/extension-history/src/index.ts
+++ b/packages/extension-history/src/index.ts
@@ -7,6 +7,8 @@ export interface HistoryOptions {
 }
 
 const History = Extension.create({
+  name: 'history',
+
   defaultOptions: <HistoryOptions>{
     depth: 100,
     newGroupDelay: 500,