diff --git a/lua/git/repo.lua b/lua/git/repo.lua
index 482ca81..61d55a4 100644
--- a/lua/git/repo.lua
+++ b/lua/git/repo.lua
@@ -354,7 +354,7 @@ end
 function M.on_uri_refresh(prefix, fn)
     return M.on("refresh", function(r)
         for buf in pairs(r.buffers) do
-            if vim.api.nvim_buf_is_valid(buf) then
+            if vim.api.nvim_buf_is_loaded(buf) then
                 local name = vim.api.nvim_buf_get_name(buf)
                 if name:sub(1, #prefix) == prefix then
                     fn(buf, r)
diff --git a/lua/git/util.lua b/lua/git/util.lua
index 4725b1a..f590d01 100644
--- a/lua/git/util.lua
+++ b/lua/git/util.lua
@@ -88,6 +88,9 @@ end
 ---@param end_ integer
 ---@param lines string[]
 function M.set_buf_lines(buf, start, end_, lines)
+    if not vim.api.nvim_buf_is_loaded(buf) then
+        return
+    end
     local was_modifiable = vim.bo[buf].modifiable
     vim.bo[buf].modifiable = true
     vim.api.nvim_buf_set_lines(buf, start, end_, true, lines)