diff --git a/src/api/api.js b/src/api/api.js
index 63c97f217..64ff7f9b0 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -182,8 +182,8 @@ export async function getEntities(items, {
             orderDirection,
             filters.staleFilter,
             [
-                ...constructTags(filters.tagFilters),
-                ...options.tags || []
+                ...constructTags(filters?.tagFilters),
+                ...options?.globalFilter?.tags || []
             ],
             filters?.registeredWithFilter,
             undefined,
@@ -191,6 +191,7 @@ export async function getEntities(items, {
             {
                 cancelToken: controller && controller.token,
                 query: {
+                    ...(options?.globalFilter?.filter && generateFilter(options.globalFilter.filter)),
                     ...(options.filter && Object.keys(options.filter).length && generateFilter(options.filter)),
                     ...(calculateSystemProfile(filters)),
                     ...(fields && Object.keys(fields).length && generateFilter(fields, 'fields')),