diff --git a/.config/nvim/after/ftplugin/org.lua b/.config/nvim/after/ftplugin/org.lua
index 610e3641..c4805fce 100644
--- a/.config/nvim/after/ftplugin/org.lua
+++ b/.config/nvim/after/ftplugin/org.lua
@@ -1,5 +1,6 @@
 vim.opt_local.breakindent = true
 vim.opt_local.scrolloff = 4
+vim.cmd("setlocal formatoptions-=r")
 -- vim.opt_local.number = false
 -- vim.opt_local.relativenumber = false
 -- vim.opt_local.textwidth = 80
diff --git a/.config/nvim/lua/plugins/orgmode.lua b/.config/nvim/lua/plugins/orgmode.lua
index 68a21270..bacf4e1f 100644
--- a/.config/nvim/lua/plugins/orgmode.lua
+++ b/.config/nvim/lua/plugins/orgmode.lua
@@ -15,10 +15,12 @@ return {
         org_blank_before_new_entry = { heading = false, plain_list_item = false },
         win_split_mode = "auto",
         mappings = {
+          -- disable_all = true,
           org_return_uses_meta_return = false,
           org = {
             org_timestamp_down = "<C-a>",
             org_timestamp_up = "<C-i>",
+            org_return = false,
           },
         },
       }