diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index a998096..f3559ac 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -507,6 +507,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
   :straight t
   :config
   (global-undo-tree-mode)
+  (evil-set-undo-system 'undo-tree)
   (setq undo-tree-visualizer-diff t)
   (setq undo-tree-visualizer-timestamps t)
   (setq undo-tree-auto-save-history nil)
diff --git a/Emacs.org b/Emacs.org
index 407121f..52b855c 100644
--- a/Emacs.org
+++ b/Emacs.org
@@ -903,6 +903,7 @@ References:
   :straight t
   :config
   (global-undo-tree-mode)
+  (evil-set-undo-system 'undo-tree)
   (setq undo-tree-visualizer-diff t)
   (setq undo-tree-visualizer-timestamps t)
   (setq undo-tree-auto-save-history nil)