diff --git a/lua/core/default_config.lua b/lua/core/default_config.lua
index 6f35471..e408db6 100644
--- a/lua/core/default_config.lua
+++ b/lua/core/default_config.lua
@@ -26,6 +26,7 @@ M.options = {
    updatetime = 250,
    undofile = true,
    fillchars = { eob = " " },
+   shadafile = vim.opt.shadafile,
 
    -- NvChad options
    nvChad = {
diff --git a/lua/core/options.lua b/lua/core/options.lua
index 9c327db..2b6c7d5 100644
--- a/lua/core/options.lua
+++ b/lua/core/options.lua
@@ -80,3 +80,10 @@ local disabled_built_ins = {
 for _, plugin in pairs(disabled_built_ins) do
    g["loaded_" .. plugin] = 1
 end
+
+--Defer loading shada until after startup_
+vim.opt.shadafile = "NONE"
+vim.schedule(function()
+   vim.opt.shadafile = require("core.utils").load_config().options.shadafile
+   vim.cmd [[ rsh ]]
+end)