diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index ea1117a906..36df24d0c1 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -20,6 +20,11 @@ vim.deepcopy = (function()
   local deepcopy_funcs = {
     table = function(orig)
       local copy = {}
+
+      if getmetatable(orig) == vim._empty_dict_mt then
+        copy = vim.empty_dict()
+      end
+
       for k, v in pairs(orig) do
         copy[vim.deepcopy(k)] = vim.deepcopy(v)
       end
diff --git a/test/functional/lua/vim_spec.lua b/test/functional/lua/vim_spec.lua
index e879f8b925..b8edd7b3e0 100644
--- a/test/functional/lua/vim_spec.lua
+++ b/test/functional/lua/vim_spec.lua
@@ -322,6 +322,48 @@ describe('lua stdlib', function()
     ]])
 
     assert(is_dc)
+
+    local is_empty_list = exec_lua([[
+      local a = {}
+      local b = vim.deepcopy(a)
+
+      local count = 0
+      for _ in pairs(b) do count = count + 1 end
+
+      return getmetatable(b) ~= vim._empty_dict_mt
+        and count == 0
+        and tostring(a) ~= tostring(b)
+    ]])
+
+    assert(is_empty_list)
+
+    local is_empty_dic = exec_lua([[
+      local a = vim.empty_dict()
+      local b = vim.deepcopy(a)
+
+      local count = 0
+      for _ in pairs(b) do count = count + 1 end
+
+      return getmetatable(b) == vim._empty_dict_mt
+        and count == 0
+    ]])
+
+    assert(is_empty_dic)
+
+    local include_empty_dic = exec_lua([[
+      local a = {x = vim.empty_dict(), y = {}}
+      local b = vim.deepcopy(a)
+
+      local count = 0
+      for _ in pairs(b) do count = count + 1 end
+
+      return getmetatable(b.x) == vim._empty_dict_mt
+        and getmetatable(b.y) ~= vim._empty_dict_mt
+        and count == 2
+        and tostring(a) ~= tostring(b)
+    ]])
+
+    assert(include_empty_dic)
   end)
 
   it('vim.pesc', function()