diff --git a/x-pack/plugins/security_solution/public/management/components/paginated_content/paginated_content.tsx b/x-pack/plugins/security_solution/public/management/components/paginated_content/paginated_content.tsx
index b3d1f21649d3..890b21624eaf 100644
--- a/x-pack/plugins/security_solution/public/management/components/paginated_content/paginated_content.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/paginated_content/paginated_content.tsx
@@ -203,8 +203,7 @@ export const PaginatedContent = memo(
           return <Item {...itemComponentProps(item)} key={key} />;
         });
       }
-
-      return noItemsMessage || <DefaultNoItemsFound />;
+      if (!loading) return noItemsMessage || <DefaultNoItemsFound />;
     }, [
       ItemComponent,
       error,
@@ -214,6 +213,7 @@ export const PaginatedContent = memo(
       itemKeys,
       items,
       noItemsMessage,
+      loading,
     ]);
 
     return (
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/store/builders.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/store/builders.ts
index 30722a33270e..8c5314dee547 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/store/builders.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/store/builders.ts
@@ -7,7 +7,7 @@
 
 import { MANAGEMENT_DEFAULT_PAGE, MANAGEMENT_DEFAULT_PAGE_SIZE } from '../../../common/constants';
 import { EventFiltersListPageState } from '../types';
-import { createLoadedResourceState, createUninitialisedResourceState } from '../../../state';
+import { createUninitialisedResourceState } from '../../../state';
 
 export const initialEventFiltersPageState = (): EventFiltersListPageState => ({
   entries: [],
@@ -28,8 +28,7 @@ export const initialEventFiltersPageState = (): EventFiltersListPageState => ({
     active: false,
     forceRefresh: false,
     data: createUninitialisedResourceState(),
-    /** We started off assuming data exists, until we can confirm otherwise */
-    dataExist: createLoadedResourceState(true),
+    dataExist: createUninitialisedResourceState(),
     deletion: {
       item: undefined,
       status: createUninitialisedResourceState(),
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/store/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/store/middleware.ts
index b32b39fb9293..d8191850e438 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/store/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/store/middleware.ts
@@ -254,24 +254,24 @@ const refreshListDataIfNeeded: MiddlewareActionHandler = async (store, eventFilt
       dispatch({
         type: 'eventFiltersListPageDataChanged',
         payload: createLoadedResourceState({
-          query,
+          query: { ...query, filter },
           content: results,
         }),
       });
 
-      dispatch({
-        type: 'eventFiltersListPageDataExistsChanged',
-        payload: {
-          type: 'LoadedResourceState',
-          data: Boolean(results.total),
-        },
-      });
-
       // If no results were returned, then just check to make sure data actually exists for
       // event filters. This is used to drive the UI between showing "empty state" and "no items found"
       // messages to the user
       if (results.total === 0) {
         await checkIfEventFilterDataExist(store, eventFiltersService);
+      } else {
+        dispatch({
+          type: 'eventFiltersListPageDataExistsChanged',
+          payload: {
+            type: 'LoadedResourceState',
+            data: Boolean(results.total),
+          },
+        });
       }
     } catch (error) {
       dispatch({
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/store/selector.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/store/selector.ts
index e6f67f7329e6..1bbc695f5323 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/store/selector.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/store/selector.ts
@@ -88,24 +88,21 @@ export const getListFetchError: EventFiltersSelector<
   return (isFailedResourceState(listPageDataState) && listPageDataState.error) || undefined;
 });
 
-export const getListIsLoading: EventFiltersSelector<boolean> = createSelector(
-  getCurrentListPageDataState,
-  (listDataState) => isLoadingResourceState(listDataState)
-);
-
 export const getListPageDataExistsState: EventFiltersSelector<
   StoreState['listPage']['dataExist']
 > = ({ listPage: { dataExist } }) => dataExist;
 
+export const getListIsLoading: EventFiltersSelector<boolean> = createSelector(
+  getCurrentListPageDataState,
+  getListPageDataExistsState,
+  (listDataState, dataExists) =>
+    isLoadingResourceState(listDataState) || isLoadingResourceState(dataExists)
+);
+
 export const getListPageDoesDataExist: EventFiltersSelector<boolean> = createSelector(
   getListPageDataExistsState,
   (dataExistsState) => {
-    if (isLoadedResourceState(dataExistsState)) {
-      return dataExistsState.data;
-    }
-
-    // Until we know for sure that data exists (LoadedState), we assume `true`
-    return true;
+    return !!getLastLoadedResourceState(dataExistsState)?.data;
   }
 );
 
@@ -179,7 +176,7 @@ export const listDataNeedsRefresh: EventFiltersSelector<boolean> = createSelecto
       forceRefresh ||
       location.page_index + 1 !== currentQuery.page ||
       location.page_size !== currentQuery.perPage ||
-      (!!location.filter && location.filter !== currentQuery.filter)
+      location.filter !== currentQuery.filter
     );
   }
 );
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/store/selectors.test.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/store/selectors.test.ts
index cba069775a90..ac2b16e51603 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/store/selectors.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/store/selectors.test.ts
@@ -186,14 +186,14 @@ describe('event filters selectors', () => {
   });
 
   describe('getListPageDoesDataExist()', () => {
-    it('should return true (default) until we get a Loaded Resource state', () => {
-      expect(getListPageDoesDataExist(initialState)).toBe(true);
+    it('should return false (default) until we get a Loaded Resource state', () => {
+      expect(getListPageDoesDataExist(initialState)).toBe(false);
 
       // Set DataExists to Loading
       // ts-ignore will be fixed when AsyncResourceState is refactored (#830)
       // @ts-ignore
       initialState.listPage.dataExist = createLoadingResourceState(initialState.listPage.dataExist);
-      expect(getListPageDoesDataExist(initialState)).toBe(true);
+      expect(getListPageDoesDataExist(initialState)).toBe(false);
 
       // Set DataExists to Failure
       initialState.listPage.dataExist = createFailedResourceState({
@@ -201,7 +201,7 @@ describe('event filters selectors', () => {
         error: 'Internal Server Error',
         message: 'Something is not right',
       });
-      expect(getListPageDoesDataExist(initialState)).toBe(true);
+      expect(getListPageDoesDataExist(initialState)).toBe(false);
     });
 
     it('should return false if no data exists', () => {
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/translations.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/translations.ts
index 248e69cc6866..a33a031d5972 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/translations.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/translations.ts
@@ -17,7 +17,7 @@ export const getCreationSuccessMessage = (
   entry: CreateExceptionListItemSchema | UpdateExceptionListItemSchema | undefined
 ) => {
   return i18n.translate('xpack.securitySolution.eventFilter.form.creationSuccessToastTitle', {
-    defaultMessage: '"{name}" has been added to the event exceptions list.',
+    defaultMessage: '"{name}" has been added to the event filters list.',
     values: { name: entry?.name },
   });
 };
@@ -33,21 +33,21 @@ export const getUpdateSuccessMessage = (
 
 export const getCreationErrorMessage = (creationError: ServerApiError) => {
   return i18n.translate('xpack.securitySolution.eventFilter.form.failedToastTitle.create', {
-    defaultMessage: 'There was an error creating the new exception: "{error}"',
+    defaultMessage: 'There was an error creating the new event filter: "{error}"',
     values: { error: creationError.message },
   });
 };
 
 export const getUpdateErrorMessage = (updateError: ServerApiError) => {
   return i18n.translate('xpack.securitySolution.eventFilter.form.failedToastTitle.update', {
-    defaultMessage: 'There was an error updating the exception: "{error}"',
+    defaultMessage: 'There was an error updating the event filter: "{error}"',
     values: { error: updateError.message },
   });
 };
 
 export const getGetErrorMessage = (getError: ServerApiError) => {
   return i18n.translate('xpack.securitySolution.eventFilter.form.failedToastTitle.get', {
-    defaultMessage: 'Unable to edit trusted application: "{error}"',
+    defaultMessage: 'Unable to edit event filter: "{error}"',
     values: { error: getError.message },
   });
 };
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
index 31ce0bc20882..cf70bc629f13 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
@@ -3360,22 +3360,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the first time
       >
         <div
           class="body-content undefined"
-        >
-          <div
-            class="euiEmptyPrompt"
-          >
-            <span
-              class="euiTextColor euiTextColor--subdued"
-            >
-              <span>
-                No items found
-              </span>
-              <div
-                class="euiSpacer euiSpacer--m"
-              />
-            </span>
-          </div>
-        </div>
+        />
       </div>
     </div>
   </div>