diff --git a/apps/web/modules/settings/outOfOffice/OutOfOfficeEntriesList.tsx b/apps/web/modules/settings/outOfOffice/OutOfOfficeEntriesList.tsx
index 306b1d83df..173cd93fdc 100644
--- a/apps/web/modules/settings/outOfOffice/OutOfOfficeEntriesList.tsx
+++ b/apps/web/modules/settings/outOfOffice/OutOfOfficeEntriesList.tsx
@@ -135,9 +135,19 @@ function OutOfOfficeEntriesListContent({
   const flatData = useMemo(
     () =>
       isPending || isFetching ? new Array(5).fill(null) : data?.pages?.flatMap((page) => page.rows) ?? [],
-    [data, selectedTab, isPending, isFetching, searchTerm]
+    [data, isPending, isFetching]
   ) as OutOfOfficeEntry[];
 
+  const deleteOutOfOfficeEntryMutation = trpc.viewer.ooo.outOfOfficeEntryDelete.useMutation({
+    onSuccess: () => {
+      showToast(t("success_deleted_entry_out_of_office"), "success");
+      setDeletedEntry((previousValue) => previousValue + 1);
+    },
+    onError: () => {
+      showToast(`An error occurred`, "error");
+    },
+  });
+
   const memoColumns = useMemo(() => {
     const columnHelper = createColumnHelper<OutOfOfficeEntry>();
     return [
@@ -333,7 +343,7 @@ function OutOfOfficeEntriesListContent({
         },
       }),
     ];
-  }, [selectedTab, isPending, isFetching, onOpenEditDialog, t]);
+  }, [selectedTab, isPending, isFetching, onOpenEditDialog, t, deleteOutOfOfficeEntryMutation, totalRowCount]);
 
   const table = useReactTable({
     data: flatData,
@@ -349,16 +359,6 @@ function OutOfOfficeEntriesListContent({
     getFilteredRowModel: getFilteredRowModel(),
   });
 
-  const deleteOutOfOfficeEntryMutation = trpc.viewer.ooo.outOfOfficeEntryDelete.useMutation({
-    onSuccess: () => {
-      showToast(t("success_deleted_entry_out_of_office"), "success");
-      setDeletedEntry((previousValue) => previousValue + 1);
-    },
-    onError: () => {
-      showToast(`An error occurred`, "error");
-    },
-  });
-
   return (
     <>
       <DataTableWrapper
@@ -388,7 +388,7 @@ function OutOfOfficeEntriesListContent({
         EmptyView={
           <EmptyScreen
             className="mt-6"
-            headline={selectedTab === OutOfOfficeTab.TEAM ? t("ooo_team_empty_title") : t("ooo_empty_title")}
+            headline={searchTerm ? t("no_result_found_for", {searchTerm}) : selectedTab === OutOfOfficeTab.TEAM ? t("ooo_team_empty_title") : t("ooo_empty_title")}
             description={
               selectedTab === OutOfOfficeTab.TEAM
                 ? t("ooo_team_empty_description")