diff --git a/lua/nvim-tree/view.lua b/lua/nvim-tree/view.lua
index b08ba2baa98..5e52701dc60 100644
--- a/lua/nvim-tree/view.lua
+++ b/lua/nvim-tree/view.lua
@@ -464,7 +464,7 @@ end
 function M.get_winnr(tabpage)
   tabpage = tabpage or vim.api.nvim_get_current_tabpage()
   local tabinfo = M.View.tabpages[tabpage]
-  if tabinfo ~= nil and vim.api.nvim_win_is_valid(tabinfo.winnr) then
+  if tabinfo and tabinfo.winnr and vim.api.nvim_win_is_valid(tabinfo.winnr) then
     return tabinfo.winnr
   end
 end