diff --git a/lua/astrocommunity/editing-support/auto-save-nvim/README.md b/lua/astrocommunity/editing-support/auto-save-nvim/README.md
index 8974f6780..b5e5a57c8 100644
--- a/lua/astrocommunity/editing-support/auto-save-nvim/README.md
+++ b/lua/astrocommunity/editing-support/auto-save-nvim/README.md
@@ -2,4 +2,4 @@
 
 🧶 Automatically save your changes in NeoVim
 
-**Repository:** <https://github.com/Pocco81/auto-save.nvim>
+**Repository:** <https://github.com/okuuva/auto-save.nvim>
diff --git a/lua/astrocommunity/editing-support/auto-save-nvim/init.lua b/lua/astrocommunity/editing-support/auto-save-nvim/init.lua
index 4ac684f8a..730b76423 100644
--- a/lua/astrocommunity/editing-support/auto-save-nvim/init.lua
+++ b/lua/astrocommunity/editing-support/auto-save-nvim/init.lua
@@ -1,30 +1,47 @@
 return {
-  "Pocco81/auto-save.nvim",
+  "okuuva/auto-save.nvim",
   event = { "User AstroFile", "InsertEnter" },
-  opts = {
-    callbacks = {
-      before_saving = function()
-        -- save global autoformat status
-        vim.g.OLD_AUTOFORMAT = vim.g.autoformat_enabled
-
-        vim.g.autoformat_enabled = false
-        vim.g.OLD_AUTOFORMAT_BUFFERS = {}
-        -- disable all manually enabled buffers
-        for _, bufnr in ipairs(vim.api.nvim_list_bufs()) do
-          if vim.b[bufnr].autoformat_enabled then
-            table.insert(vim.g.OLD_BUFFER_AUTOFORMATS, bufnr)
-            vim.b[bufnr].autoformat_enabled = false
-          end
-        end
-      end,
-      after_saving = function()
-        -- restore global autoformat status
-        vim.g.autoformat_enabled = vim.g.OLD_AUTOFORMAT
-        -- reenable all manually enabled buffers
-        for _, bufnr in ipairs(vim.g.OLD_AUTOFORMAT_BUFFERS or {}) do
-          vim.b[bufnr].autoformat_enabled = true
-        end
-      end,
+  dependencies = {
+    "AstroNvim/astrocore",
+    opts = {
+      autocmds = {
+        autoformat_toggle = {
+          -- Disable autoformat before saving
+          {
+            event = "User",
+            desc = "Disable autoformat before saving",
+            pattern = "AutoSaveWritePre",
+            callback = function()
+              -- Save global autoformat status
+              vim.g.OLD_AUTOFORMAT = vim.g.autoformat
+              vim.g.autoformat = false
+              vim.g.OLD_AUTOFORMAT_BUFFERS = {}
+              -- Disable all manually enabled buffers
+              for _, bufnr in ipairs(vim.api.nvim_list_bufs()) do
+                if vim.b[bufnr].autoformat then
+                  table.insert(vim.g.OLD_AUTOFORMAT_BUFFERS, bufnr)
+                  vim.b[bufnr].autoformat = false
+                end
+              end
+            end,
+          },
+          -- Re-enable autoformat after saving
+          {
+            event = "User",
+            desc = "Re-enable autoformat after saving",
+            pattern = "AutoSaveWritePost",
+            callback = function()
+              -- Restore global autoformat status
+              vim.g.autoformat = vim.g.OLD_AUTOFORMAT
+              -- Re-enable all manually enabled buffers
+              for _, bufnr in ipairs(vim.g.OLD_AUTOFORMAT_BUFFERS or {}) do
+                vim.b[bufnr].autoformat = true
+              end
+            end,
+          },
+        },
+      },
     },
   },
+  opts = {},
 }