diff --git a/rhodecode/model/scm.py b/rhodecode/model/scm.py
--- a/rhodecode/model/scm.py
+++ b/rhodecode/model/scm.py
@@ -605,8 +605,11 @@ class ScmModel(BaseModel):
             _repo = self._get_repo(repo_name)
             commit = _repo.scm_instance().get_commit(commit_id=commit_id)
             root_path = root_path.lstrip('/')
-            for __, dirs, files in commit.walk(root_path):
 
+            top_node = commit.get_node(root_path)
+            top_node.default_pre_load = []
+
+            for __, dirs, files in commit.walk(top_node):
                 for f in files:
 
                     _data = {