diff --git a/lua/nvim-tree/actions/change-dir.lua b/lua/nvim-tree/actions/change-dir.lua
index 1de542b7..483ea214 100644
--- a/lua/nvim-tree/actions/change-dir.lua
+++ b/lua/nvim-tree/actions/change-dir.lua
@@ -3,7 +3,6 @@ local a = vim.api
 local log = require "nvim-tree.log"
 local utils = require "nvim-tree.utils"
 local core = require "nvim-tree.core"
-local diagnostics = require "nvim-tree.diagnostics"
 
 local M = {
   current_tab = a.nvim_get_current_tabpage(),
@@ -42,7 +41,6 @@ function M.force_dirchange(foldername, with_open)
   else
     require("nvim-tree.renderer").draw()
   end
-  diagnostics.update()
 
   log.profile_end(ps, "change dir %s", foldername)
 end
diff --git a/lua/nvim-tree/actions/collapse-all.lua b/lua/nvim-tree/actions/collapse-all.lua
index 145a4d8e..3812942d 100644
--- a/lua/nvim-tree/actions/collapse-all.lua
+++ b/lua/nvim-tree/actions/collapse-all.lua
@@ -1,7 +1,6 @@
 local renderer = require "nvim-tree.renderer"
 local utils = require "nvim-tree.utils"
 local core = require "nvim-tree.core"
-local diagnostics = require "nvim-tree.diagnostics"
 
 local M = {}
 
@@ -39,7 +38,6 @@ function M.fn(keep_buffers)
 
   iter(core.get_explorer().nodes)
   renderer.draw()
-  diagnostics.update()
 end
 
 return M
diff --git a/lua/nvim-tree/actions/movements.lua b/lua/nvim-tree/actions/movements.lua
index e3a49838..ee173c91 100644
--- a/lua/nvim-tree/actions/movements.lua
+++ b/lua/nvim-tree/actions/movements.lua
@@ -1,6 +1,5 @@
 local utils = require "nvim-tree.utils"
 local view = require "nvim-tree.view"
-local diagnostics = require "nvim-tree.diagnostics"
 local renderer = require "nvim-tree.renderer"
 local core = require "nvim-tree.core"
 local lib = require "nvim-tree.lib"
@@ -49,7 +48,6 @@ function M.parent_node(should_close)
     view.set_cursor { line + 1, 0 }
     if should_close then
       parent.open = false
-      diagnostics.update()
       renderer.draw()
     end
   end
diff --git a/lua/nvim-tree/actions/reloaders.lua b/lua/nvim-tree/actions/reloaders.lua
index da6a9195..c2aa7a5f 100644
--- a/lua/nvim-tree/actions/reloaders.lua
+++ b/lua/nvim-tree/actions/reloaders.lua
@@ -1,5 +1,4 @@
 local git = require "nvim-tree.git"
-local diagnostics = require "nvim-tree.diagnostics"
 local view = require "nvim-tree.view"
 local renderer = require "nvim-tree.renderer"
 local explorer_module = require "nvim-tree.explorer"
@@ -45,7 +44,6 @@ function M.reload_explorer()
   if view.is_visible() then
     renderer.draw()
   end
-  diagnostics.update()
   event_running = false
 end
 
diff --git a/lua/nvim-tree/actions/toggles.lua b/lua/nvim-tree/actions/toggles.lua
index 36ffeba6..d761d209 100644
--- a/lua/nvim-tree/actions/toggles.lua
+++ b/lua/nvim-tree/actions/toggles.lua
@@ -2,7 +2,6 @@ local view = require "nvim-tree.view"
 local filters = require "nvim-tree.explorer.filters"
 local renderer = require "nvim-tree.renderer"
 local reloaders = require "nvim-tree.actions.reloaders"
-local diagnostics = require "nvim-tree.diagnostics"
 
 local M = {}
 
@@ -24,11 +23,6 @@ end
 function M.help()
   view.toggle_help()
   renderer.draw()
-  if view.is_help_ui() then
-    diagnostics.clear()
-  else
-    diagnostics.update()
-  end
 end
 
 return M
diff --git a/lua/nvim-tree/lib.lua b/lua/nvim-tree/lib.lua
index 89010cc4..37e0b0c2 100644
--- a/lua/nvim-tree/lib.lua
+++ b/lua/nvim-tree/lib.lua
@@ -1,7 +1,6 @@
 local api = vim.api
 
 local renderer = require "nvim-tree.renderer"
-local diagnostics = require "nvim-tree.diagnostics"
 local view = require "nvim-tree.view"
 local core = require "nvim-tree.core"
 
@@ -71,7 +70,6 @@ function M.expand_or_collapse(node)
   end
 
   renderer.draw()
-  diagnostics.update()
 end
 
 function M.set_target_win()
@@ -122,7 +120,6 @@ function M.open(cwd)
   else
     open_view_and_draw()
   end
-  diagnostics.update()
   view.restore_tab_state()
 end
 
diff --git a/lua/nvim-tree/renderer/init.lua b/lua/nvim-tree/renderer/init.lua
index f1a744b2..8eb042b0 100644
--- a/lua/nvim-tree/renderer/init.lua
+++ b/lua/nvim-tree/renderer/init.lua
@@ -1,10 +1,12 @@
+local core = require "nvim-tree.core"
+local diagnostics = require "nvim-tree.diagnostics"
 local log = require "nvim-tree.log"
 local view = require "nvim-tree.view"
+
 local _padding = require "nvim-tree.renderer.components.padding"
 local icon_component = require "nvim-tree.renderer.components.icons"
 local help = require "nvim-tree.renderer.help"
 local git = require "nvim-tree.renderer.components.git"
-local core = require "nvim-tree.core"
 local Builder = require "nvim-tree.renderer.builder"
 
 local api = vim.api
@@ -92,6 +94,12 @@ function M.draw()
     api.nvim_win_set_cursor(view.get_winnr(), cursor)
   end
 
+  if view.is_help_ui() then
+    diagnostics.clear()
+  else
+    diagnostics.update()
+  end
+
   log.profile_end(ps, "draw")
 end