diff --git a/.config/nvim/lua/custom/plugins/auto-save.lua b/.config/nvim/lua/custom/plugins/auto-save.lua
index 4299d0d..1bcdac1 100644
--- a/.config/nvim/lua/custom/plugins/auto-save.lua
+++ b/.config/nvim/lua/custom/plugins/auto-save.lua
@@ -2,10 +2,32 @@ return {
     'okuuva/auto-save.nvim',
     cmd = 'ASToggle',
     event = { 'InsertLeave', 'TextChanged' },
-    opts = {
-        execution_message = { enabled = false },
-        condition = function(buf)
-            return vim.fn.getbufvar(buf, '&buftype') == ''
-        end,
-    },
+    opts = function()
+        -- Disable autoformat between automatic saves
+        vim.api.nvim_create_autocmd('User', {
+            pattern = 'AutoSaveWritePre',
+            group = vim.api.nvim_create_augroup('autosave-pre', { clear = true }),
+            callback = function(opts)
+                local bufnr = opts.data.saved_buffer
+                vim.b[bufnr].disable_autoformat = true
+            end,
+        })
+
+        vim.api.nvim_create_autocmd('User', {
+            pattern = 'AutoSaveWritePost',
+            group = vim.api.nvim_create_augroup('autosave-post', { clear = true }),
+            callback = function(opts)
+                local bufnr = opts.data.saved_buffer
+                vim.b[bufnr].disable_autoformat = false
+            end,
+        })
+
+        return {
+            execution_message = { enabled = false },
+            condition = function(buf)
+                -- Save only if the buffer is not a "special buffer"
+                return vim.fn.getbufvar(buf, '&buftype') == ''
+            end,
+        }
+    end,
 }