diff --git a/lua/nvim-tree.lua b/lua/nvim-tree.lua
index 4ea352c73b1..ffddba0b78b 100644
--- a/lua/nvim-tree.lua
+++ b/lua/nvim-tree.lua
@@ -752,7 +752,7 @@ function M.purge_all_state()
   view.abandon_all_windows()
   if core.get_explorer() ~= nil then
     git.purge_state()
-    TreeExplorer = nil
+    core.reset_explorer()
   end
 end
 
diff --git a/lua/nvim-tree/core.lua b/lua/nvim-tree/core.lua
index 251cb059915..036411fa51e 100644
--- a/lua/nvim-tree/core.lua
+++ b/lua/nvim-tree/core.lua
@@ -6,7 +6,7 @@ local log = require "nvim-tree.log"
 
 local M = {}
 
-TreeExplorer = nil
+local TreeExplorer = nil
 local first_init_done = false
 
 function M.init(foldername)
@@ -27,6 +27,10 @@ function M.get_explorer()
   return TreeExplorer
 end
 
+function M.reset_explorer()
+  TreeExplorer = nil
+end
+
 function M.get_cwd()
   return TreeExplorer and TreeExplorer.absolute_path
 end
diff --git a/lua/nvim-tree/live-filter.lua b/lua/nvim-tree/live-filter.lua
index 6e510cba355..16eb159693c 100644
--- a/lua/nvim-tree/live-filter.lua
+++ b/lua/nvim-tree/live-filter.lua
@@ -11,7 +11,7 @@ local function redraw()
 end
 
 local function reset_filter(node_)
-  node_ = node_ or TreeExplorer
+  node_ = node_ or require("nvim-tree.core").get_explorer()
   Iterator.builder(node_.nodes)
     :hidden()
     :applier(function(node)
@@ -79,7 +79,7 @@ function M.apply_filter(node_)
     node.hidden = not (has_nodes or (ok and is_match))
   end
 
-  iterate(node_ or TreeExplorer)
+  iterate(node_ or require("nvim-tree.core").get_explorer())
 end
 
 local function record_char()