diff --git a/.config/nvim/after/ftplugin/org.lua b/.config/nvim/after/ftplugin/org.lua
index 8e6c72c2..e2e67527 100644
--- a/.config/nvim/after/ftplugin/org.lua
+++ b/.config/nvim/after/ftplugin/org.lua
@@ -4,3 +4,9 @@ vim.api.nvim_create_autocmd({ "InsertLeave", "TextChanged" }, {
   buffer = 0,
   command = "silent! write",
 })
+vim.api.nvim_create_autocmd("BufWritePre", {
+  pattern = "*",
+  callback = function()
+    vim.cmd("%s/\\s\\+$//e")
+  end,
+})