diff --git a/packages/twenty-front/package.json b/packages/twenty-front/package.json
index 9e5520c1c45..90cd99bc26a 100644
--- a/packages/twenty-front/package.json
+++ b/packages/twenty-front/package.json
@@ -52,15 +52,13 @@
     "@nivo/radial-bar": "^0.99.0",
     "@react-pdf/renderer": "^4.1.6",
     "@scalar/api-reference-react": "^0.4.36",
-    "@tiptap/core": "^2.10.4",
-    "@tiptap/extension-document": "^2.10.4",
-    "@tiptap/extension-hard-break": "^2.10.4",
-    "@tiptap/extension-history": "^2.10.4",
-    "@tiptap/extension-paragraph": "^2.10.4",
-    "@tiptap/extension-placeholder": "^2.10.4",
-    "@tiptap/extension-text": "^2.10.4",
-    "@tiptap/extension-text-style": "^2.10.4",
-    "@tiptap/react": "^2.10.4",
+    "@tiptap/core": "^3.4.2",
+    "@tiptap/extension-document": "^3.4.2",
+    "@tiptap/extension-hard-break": "^3.4.2",
+    "@tiptap/extension-paragraph": "^3.4.2",
+    "@tiptap/extension-text": "^3.4.2",
+    "@tiptap/extensions": "^3.4.2",
+    "@tiptap/react": "^3.4.2",
     "@xyflow/react": "^12.4.2",
     "apollo-link-rest": "^0.9.0",
     "apollo-upload-client": "^17.0.0",
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/hooks/useTextVariableEditor.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/hooks/useTextVariableEditor.ts
index 007050884c7..f6011e83cce 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/hooks/useTextVariableEditor.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/hooks/useTextVariableEditor.ts
@@ -2,10 +2,9 @@ import { getInitialEditorContent } from '@/workflow/workflow-variables/utils/get
 import { VariableTag } from '@/workflow/workflow-variables/utils/variableTag';
 import Document from '@tiptap/extension-document';
 import HardBreak from '@tiptap/extension-hard-break';
-import History from '@tiptap/extension-history';
 import Paragraph from '@tiptap/extension-paragraph';
-import { default as Placeholder } from '@tiptap/extension-placeholder';
 import Text from '@tiptap/extension-text';
+import { Placeholder, UndoRedo } from '@tiptap/extensions';
 import { type Editor, useEditor } from '@tiptap/react';
 import { isDefined } from 'twenty-shared/utils';
 
@@ -40,7 +39,7 @@ export const useTextVariableEditor = ({
             }),
           ]
         : []),
-      History,
+      UndoRedo,
     ],
     content: isDefined(defaultValue)
       ? getInitialEditorContent(defaultValue)
diff --git a/yarn.lock b/yarn.lock
index 094c687b2a5..5b30e4992c9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19141,7 +19141,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/core@npm:^2.10.4, @tiptap/core@npm:^2.12.0":
+"@tiptap/core@npm:^2.12.0":
   version: 2.12.0
   resolution: "@tiptap/core@npm:2.12.0"
   peerDependencies:
@@ -19150,6 +19150,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tiptap/core@npm:^3.4.2":
+  version: 3.4.2
+  resolution: "@tiptap/core@npm:3.4.2"
+  peerDependencies:
+    "@tiptap/pm": ^3.4.2
+  checksum: 10c0/da60f88603423c5c878276591e026e5458c4844557a28fc140d927dcc0611ea90cb05dff2a9d8f67ee34bb33c1ee686ae4c2c2e7bacfa1833bc548835f237267
+  languageName: node
+  linkType: hard
+
 "@tiptap/extension-bold@npm:^2.11.5":
   version: 2.12.0
   resolution: "@tiptap/extension-bold@npm:2.12.0"
@@ -19171,6 +19180,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tiptap/extension-bubble-menu@npm:^3.4.2":
+  version: 3.4.2
+  resolution: "@tiptap/extension-bubble-menu@npm:3.4.2"
+  dependencies:
+    "@floating-ui/dom": "npm:^1.0.0"
+  peerDependencies:
+    "@tiptap/core": ^3.4.2
+    "@tiptap/pm": ^3.4.2
+  checksum: 10c0/f4d967f704a0bb85b436bdd6261f210eedbdfd3857ec2caf55df359dda2f6eb990b59f800efdb43593602ed92b069d9891b471855214a008a94b680d40117eb0
+  languageName: node
+  linkType: hard
+
 "@tiptap/extension-code@npm:^2.11.5":
   version: 2.12.0
   resolution: "@tiptap/extension-code@npm:2.12.0"
@@ -19180,12 +19201,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/extension-document@npm:^2.10.4":
-  version: 2.10.4
-  resolution: "@tiptap/extension-document@npm:2.10.4"
+"@tiptap/extension-document@npm:^3.4.2":
+  version: 3.4.2
+  resolution: "@tiptap/extension-document@npm:3.4.2"
   peerDependencies:
-    "@tiptap/core": ^2.7.0
-  checksum: 10c0/ec2f7d0ee6176b922c797c90b07780ab223108b66f7fb7307dbb94c4a5a2e4e49205587a6adac25e74cd8f2d884b664ada698cd1dfe17ee03c4abe695c739df2
+    "@tiptap/core": ^3.4.2
+  checksum: 10c0/1e6249975109cfc3cc8fda1a5f1c01e588f4ec464f653df433b6da6739344f15768e3eebf2dc36828e17ef953ce3cdadb44c64140a9db360296985c8a9fae8df
   languageName: node
   linkType: hard
 
@@ -19201,6 +19222,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tiptap/extension-floating-menu@npm:^3.4.2":
+  version: 3.4.2
+  resolution: "@tiptap/extension-floating-menu@npm:3.4.2"
+  peerDependencies:
+    "@floating-ui/dom": ^1.0.0
+    "@tiptap/core": ^3.4.2
+    "@tiptap/pm": ^3.4.2
+  checksum: 10c0/7c54962faffa1d8bf0f35c1b6f28b8b6a13b2684cc06f248d4f693d0e8ca14232fde977fb747fcaccb2d84e0763627f24c43d48517649946fb1632962ad69929
+  languageName: node
+  linkType: hard
+
 "@tiptap/extension-gapcursor@npm:^2.11.5":
   version: 2.12.0
   resolution: "@tiptap/extension-gapcursor@npm:2.12.0"
@@ -19211,16 +19243,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/extension-hard-break@npm:^2.10.4":
-  version: 2.10.4
-  resolution: "@tiptap/extension-hard-break@npm:2.10.4"
+"@tiptap/extension-hard-break@npm:^3.4.2":
+  version: 3.4.2
+  resolution: "@tiptap/extension-hard-break@npm:3.4.2"
   peerDependencies:
-    "@tiptap/core": ^2.7.0
-  checksum: 10c0/773d6dbff87375613f1d3595fb3e21fd832b81a8459e1ce20b0e61526692c76f75f73efb9440414746da463821f885fa5c538ef2200df7e3fa3a08164e516ef0
+    "@tiptap/core": ^3.4.2
+  checksum: 10c0/cf6e9da1e8914dee2995ebb683d94d604d63b66587f99debe6fbf6626a3abdcff5ddca8017fa87ac331da190659dc79964d5df20f9a47a2e521f0ab8984c6610
   languageName: node
   linkType: hard
 
-"@tiptap/extension-history@npm:^2.10.4, @tiptap/extension-history@npm:^2.11.5":
+"@tiptap/extension-history@npm:^2.11.5":
   version: 2.12.0
   resolution: "@tiptap/extension-history@npm:2.12.0"
   peerDependencies:
@@ -19261,7 +19293,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/extension-paragraph@npm:^2.10.4, @tiptap/extension-paragraph@npm:^2.11.5":
+"@tiptap/extension-paragraph@npm:^2.11.5":
   version: 2.12.0
   resolution: "@tiptap/extension-paragraph@npm:2.12.0"
   peerDependencies:
@@ -19270,13 +19302,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/extension-placeholder@npm:^2.10.4":
-  version: 2.10.4
-  resolution: "@tiptap/extension-placeholder@npm:2.10.4"
+"@tiptap/extension-paragraph@npm:^3.4.2":
+  version: 3.4.2
+  resolution: "@tiptap/extension-paragraph@npm:3.4.2"
   peerDependencies:
-    "@tiptap/core": ^2.7.0
-    "@tiptap/pm": ^2.7.0
-  checksum: 10c0/f9cfd1c8f350a3e9a5c790f984b2612d465b5aac3e64991e7b7a984f66a08e64bc387ef3cb7c2f1b34dcbfc67dc162b217c027949c8c9b714622b46bda3f90d0
+    "@tiptap/core": ^3.4.2
+  checksum: 10c0/350a76998f9142987284593c35e857387a1ad2acbbf984b7dd73c1dfb4cdc62ad03e331b614ce1ad1378ef8796c0a31641ea4c6511773bf13cf98cd9dc0f4fc5
   languageName: node
   linkType: hard
 
@@ -19307,16 +19338,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/extension-text-style@npm:^2.10.4":
-  version: 2.10.4
-  resolution: "@tiptap/extension-text-style@npm:2.10.4"
-  peerDependencies:
-    "@tiptap/core": ^2.7.0
-  checksum: 10c0/ef9f70233fc2b78596e54c15c963d631a4ea49264142f4b04f011c12e833e7347f6e5cdb936760867b9530ce63d2b747f0d82ffca5a44264670e272565ee1b3a
-  languageName: node
-  linkType: hard
-
-"@tiptap/extension-text@npm:^2.10.4, @tiptap/extension-text@npm:^2.11.5":
+"@tiptap/extension-text@npm:^2.11.5":
   version: 2.12.0
   resolution: "@tiptap/extension-text@npm:2.12.0"
   peerDependencies:
@@ -19325,6 +19347,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tiptap/extension-text@npm:^3.4.2":
+  version: 3.4.2
+  resolution: "@tiptap/extension-text@npm:3.4.2"
+  peerDependencies:
+    "@tiptap/core": ^3.4.2
+  checksum: 10c0/ee2f6fcda4151031e7969823ee6a32e40b3e95d3ab49e75f20c5d3264c13476ebc260ba3a74307796bb208bba667d9f608371c14b1806bd20ad6f41c209bdd56
+  languageName: node
+  linkType: hard
+
 "@tiptap/extension-underline@npm:^2.11.5":
   version: 2.12.0
   resolution: "@tiptap/extension-underline@npm:2.12.0"
@@ -19334,6 +19365,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tiptap/extensions@npm:^3.4.2":
+  version: 3.4.2
+  resolution: "@tiptap/extensions@npm:3.4.2"
+  peerDependencies:
+    "@tiptap/core": ^3.4.2
+    "@tiptap/pm": ^3.4.2
+  checksum: 10c0/e9b1290a1f48d23c12cfab999235b55184da511e3305be1e864221e3902ad815a2ac9934c63bad894ba2fe9c0f5fa6fddff26a5a2a6c32b2bfe157e1be980762
+  languageName: node
+  linkType: hard
+
 "@tiptap/pm@npm:^2.12.0":
   version: 2.12.0
   resolution: "@tiptap/pm@npm:2.12.0"
@@ -19360,7 +19401,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/react@npm:^2.10.4, @tiptap/react@npm:^2.12.0":
+"@tiptap/react@npm:^2.12.0":
   version: 2.12.0
   resolution: "@tiptap/react@npm:2.12.0"
   dependencies:
@@ -19378,6 +19419,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tiptap/react@npm:^3.4.2":
+  version: 3.4.2
+  resolution: "@tiptap/react@npm:3.4.2"
+  dependencies:
+    "@tiptap/extension-bubble-menu": "npm:^3.4.2"
+    "@tiptap/extension-floating-menu": "npm:^3.4.2"
+    "@types/use-sync-external-store": "npm:^0.0.6"
+    fast-deep-equal: "npm:^3.1.3"
+    use-sync-external-store: "npm:^1.4.0"
+  peerDependencies:
+    "@tiptap/core": ^3.4.2
+    "@tiptap/pm": ^3.4.2
+    "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
+    "@types/react-dom": ^17.0.0 || ^18.0.0 || ^19.0.0
+    react: ^17.0.0 || ^18.0.0 || ^19.0.0
+    react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0
+  dependenciesMeta:
+    "@tiptap/extension-bubble-menu":
+      optional: true
+    "@tiptap/extension-floating-menu":
+      optional: true
+  checksum: 10c0/41bad3434fed432343dd2908f23386eb07da0e2b256f7fd2680133389a636ac792a262fffdce485b938c836452f73ee52d4a33f544192834b882a3613b147e59
+  languageName: node
+  linkType: hard
+
 "@toeverything/y-indexeddb@npm:^0.10.0-canary.9":
   version: 0.10.0-canary.9
   resolution: "@toeverything/y-indexeddb@npm:0.10.0-canary.9"
@@ -51568,15 +51634,13 @@ __metadata:
     "@nivo/radial-bar": "npm:^0.99.0"
     "@react-pdf/renderer": "npm:^4.1.6"
     "@scalar/api-reference-react": "npm:^0.4.36"
-    "@tiptap/core": "npm:^2.10.4"
-    "@tiptap/extension-document": "npm:^2.10.4"
-    "@tiptap/extension-hard-break": "npm:^2.10.4"
-    "@tiptap/extension-history": "npm:^2.10.4"
-    "@tiptap/extension-paragraph": "npm:^2.10.4"
-    "@tiptap/extension-placeholder": "npm:^2.10.4"
-    "@tiptap/extension-text": "npm:^2.10.4"
-    "@tiptap/extension-text-style": "npm:^2.10.4"
-    "@tiptap/react": "npm:^2.10.4"
+    "@tiptap/core": "npm:^3.4.2"
+    "@tiptap/extension-document": "npm:^3.4.2"
+    "@tiptap/extension-hard-break": "npm:^3.4.2"
+    "@tiptap/extension-paragraph": "npm:^3.4.2"
+    "@tiptap/extension-text": "npm:^3.4.2"
+    "@tiptap/extensions": "npm:^3.4.2"
+    "@tiptap/react": "npm:^3.4.2"
     "@types/apollo-upload-client": "npm:^17.0.2"
     "@types/file-saver": "npm:^2.0.7"
     "@types/js-cookie": "npm:^3.0.3"