diff --git a/lua/yanky.lua b/lua/yanky.lua
index 233ae7f..fbfb4e4 100644
--- a/lua/yanky.lua
+++ b/lua/yanky.lua
@@ -38,7 +38,6 @@ function yanky.setup(options)
   end
 
   yanky.history = require("yanky.history")
-  yanky.history.setup(yanky.config)
 
   system_clipboard.setup(yanky.history, yanky.config)
   highlight.setup(yanky.config)
diff --git a/lua/yanky/storage/shada.lua b/lua/yanky/storage/shada.lua
index f2042d6..0b31f1b 100644
--- a/lua/yanky/storage/shada.lua
+++ b/lua/yanky/storage/shada.lua
@@ -2,6 +2,9 @@ local shada = {}
 
 function shada.setup(config)
   shada.config = config
+  if nil == vim.g.YANKY_HISTORY then
+    vim.g.YANKY_HISTORY = {}
+  end
 end
 
 function shada.push(item)