diff --git a/apps/tools/serializers/tool.py b/apps/tools/serializers/tool.py
index 398b3b5c564..7a09853c0b8 100644
--- a/apps/tools/serializers/tool.py
+++ b/apps/tools/serializers/tool.py
@@ -246,7 +246,7 @@ def get_query_set(self, workspace_manage, is_x_pack_ee):
             if workspace_id is not None:
                 folder_query_set = folder_query_set.filter(workspace_id=workspace_id)
                 default_query_set = default_query_set.filter(workspace_id=workspace_id)
-            if folder_id is not None:
+            if folder_id is not None and folder_id != workspace_id:
                 folder_query_set = folder_query_set.filter(parent=folder_id)
                 default_query_set = default_query_set.filter(folder_id=folder_id)
             if name is not None:
@@ -267,7 +267,6 @@ def get_query_set(self, workspace_manage, is_x_pack_ee):
                 tool_query_set = tool_query_set.filter(tool_type=tool_type)
 
             query_set_dict = {
-                'folder_query_set': folder_query_set,
                 'tool_query_set': tool_query_set,
                 'default_query_set': default_query_set,
             }