diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsListContainer.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsListContainer.tsx
index af5b743fb..ba96e2da4 100644
--- a/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsListContainer.tsx
+++ b/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsListContainer.tsx
@@ -134,7 +134,12 @@ export const DatasetGroupDatasetsListContainer: React.FC<{
         useRowClickSelectChange={false}
         selectedRowKeys={selectedRowKeys}
         onSelectChange={setSelectedRowKeys}
-        emptyState={<EmptyStateList text="No dataset groups found" />}
+        emptyState={useMemo(
+          () => (
+            <EmptyStateList text="No dataset groups found" />
+          ),
+          []
+        )}
       />
     </InfiniteListContainer>
   );
diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupDatasetsListContainer.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupDatasetsListContainer.tsx
index e33fba976..7a6c55965 100644
--- a/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupDatasetsListContainer.tsx
+++ b/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupDatasetsListContainer.tsx
@@ -134,7 +134,12 @@ export const DatasetGroupDatasetGroupsListContainer: React.FC<{
         useRowClickSelectChange={false}
         selectedRowKeys={selectedRowKeys}
         onSelectChange={setSelectedRowKeys}
-        emptyState={<EmptyStateList text="No dataset groups found" />}
+        emptyState={useMemo(
+          () => (
+            <EmptyStateList text="No dataset groups found" />
+          ),
+          []
+        )}
       />
     </InfiniteListContainer>
   );
diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx
index ebf780710..1ef14d3ba 100644
--- a/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx
+++ b/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx
@@ -138,7 +138,12 @@ export const DatasetGroupUsersListContainer: React.FC<{
         useRowClickSelectChange={false}
         selectedRowKeys={selectedRowKeys}
         onSelectChange={setSelectedRowKeys}
-        emptyState={<EmptyStateList text="No dataset groups found" />}
+        emptyState={useMemo(
+          () => (
+            <EmptyStateList text="No dataset groups found" />
+          ),
+          []
+        )}
       />
     </InfiniteListContainer>
   );
diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/ListPermissionGroupsComponent.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/ListPermissionGroupsComponent.tsx
index a3f66f51b..932a56332 100644
--- a/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/ListPermissionGroupsComponent.tsx
+++ b/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/ListPermissionGroupsComponent.tsx
@@ -54,7 +54,12 @@ export const ListPermissionGroupsComponent: React.FC<{
         showHeader={true}
         showSelectAll={false}
         rowClassName="pl-[30px]!"
-        emptyState={<EmptyStateList text="No permission groups found" />}
+        emptyState={useMemo(
+          () => (
+            <EmptyStateList text="No permission groups found" />
+          ),
+          []
+        )}
       />
     </InfiniteListContainer>
   );
diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetsListContainer.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetsListContainer.tsx
index 66988a137..afe3a78bc 100644
--- a/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetsListContainer.tsx
+++ b/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetsListContainer.tsx
@@ -129,7 +129,12 @@ export const PermissionGroupDatasetGroupsListContainer: React.FC<{
         useRowClickSelectChange={false}
         selectedRowKeys={selectedRowKeys}
         onSelectChange={setSelectedRowKeys}
-        emptyState={<EmptyStateList text="No dataset groups found" />}
+        emptyState={useMemo(
+          () => (
+            <EmptyStateList text="No dataset groups found" />
+          ),
+          []
+        )}
       />
     </InfiniteListContainer>
   );
diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsListContainer.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsListContainer.tsx
index fa6d7b04b..bac8733e7 100644
--- a/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsListContainer.tsx
+++ b/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsListContainer.tsx
@@ -134,7 +134,12 @@ export const PermissionGroupDatasetsListContainer: React.FC<{
         useRowClickSelectChange={false}
         selectedRowKeys={selectedRowKeys}
         onSelectChange={setSelectedRowKeys}
-        emptyState={<EmptyStateList text="No dataset groups found" />}
+        emptyState={useMemo(
+          () => (
+            <EmptyStateList text="No dataset groups found" />
+          ),
+          []
+        )}
       />
     </InfiniteListContainer>
   );
diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx
index dd1f4ce0a..20e63f79f 100644
--- a/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx
+++ b/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx
@@ -133,7 +133,12 @@ export const PermissionGroupUsersListContainer: React.FC<{
         useRowClickSelectChange={false}
         selectedRowKeys={selectedRowKeys}
         onSelectChange={setSelectedRowKeys}
-        emptyState={<EmptyStateList text="No dataset groups found" />}
+        emptyState={useMemo(
+          () => (
+            <EmptyStateList text="No dataset groups found" />
+          ),
+          []
+        )}
       />
     </InfiniteListContainer>
   );
diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/attributes/UserAttributesListContainer.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/attributes/UserAttributesListContainer.tsx
index 609b1b0db..aa82faf13 100644
--- a/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/attributes/UserAttributesListContainer.tsx
+++ b/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/attributes/UserAttributesListContainer.tsx
@@ -44,7 +44,12 @@ export const UserAttributesListContainer: React.FC<{
         showHeader={true}
         showSelectAll={false}
         useRowClickSelectChange={false}
-        emptyState={<EmptyStateList text="No datasets found" />}
+        emptyState={useMemo(
+          () => (
+            <EmptyStateList text="No datasets found" />
+          ),
+          []
+        )}
       />
     </InfiniteListContainer>
   );
diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsListContainer.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsListContainer.tsx
index 2081eb98f..950a343a6 100644
--- a/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsListContainer.tsx
+++ b/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsListContainer.tsx
@@ -130,7 +130,12 @@ export const UserDatasetsListContainer: React.FC<{
         useRowClickSelectChange={false}
         selectedRowKeys={selectedRowKeys}
         onSelectChange={setSelectedRowKeys}
-        emptyState={<EmptyStateList text="No datasets found" />}
+        emptyState={useMemo(
+          () => (
+            <EmptyStateList text="No datasets found" />
+          ),
+          []
+        )}
       />
     </InfiniteListContainer>
   );
diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupsListContainer.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupsListContainer.tsx
index 9c90ec8f0..4a9635caf 100644
--- a/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupsListContainer.tsx
+++ b/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupsListContainer.tsx
@@ -136,7 +136,12 @@ export const UserPermissionGroupsListContainer: React.FC<{
         useRowClickSelectChange={false}
         selectedRowKeys={selectedRowKeys}
         onSelectChange={setSelectedRowKeys}
-        emptyState={<EmptyStateList text="No permission groups found" />}
+        emptyState={useMemo(
+          () => (
+            <EmptyStateList text="No permission groups found" />
+          ),
+          []
+        )}
       />
     </InfiniteListContainer>
   );
diff --git a/web/src/controllers/ChatsListController/ChatItemsContainer.tsx b/web/src/controllers/ChatsListController/ChatItemsContainer.tsx
index c5d6a186f..a8a2cb5ce 100644
--- a/web/src/controllers/ChatsListController/ChatItemsContainer.tsx
+++ b/web/src/controllers/ChatsListController/ChatItemsContainer.tsx
@@ -117,7 +117,12 @@ export const ChatItemsContainer: React.FC<{
         columns={columns}
         onSelectChange={onSelectChange}
         selectedRowKeys={selectedRowKeys}
-        emptyState={<EmptyState loading={loading} type={type} />}
+        emptyState={useMemo(
+          () => (
+            <EmptyState loading={loading} type={type} />
+          ),
+          [loading, type]
+        )}
       />
 
       <ChatSelectedOptionPopup
diff --git a/web/src/controllers/DatasetsListController/DatasetListContent.tsx b/web/src/controllers/DatasetsListController/DatasetListContent.tsx
index 6a8a9edab..f8ce7612f 100644
--- a/web/src/controllers/DatasetsListController/DatasetListContent.tsx
+++ b/web/src/controllers/DatasetsListController/DatasetListContent.tsx
@@ -84,19 +84,21 @@ export const DatasetListContent: React.FC<{
           rows={rows}
           selectedRowKeys={selectedRowKeys}
           onSelectChange={setSelectedRowKeys}
-          emptyState={
-            !isFetchedDatasets ? (
-              <></>
-            ) : (
-              <ListEmptyStateWithButton
-                isAdmin={isAdmin}
-                title="You don't have any datasets yet."
-                buttonText="New dataset"
-                description="Datasets help you organize your data. Datasets will appear here when you create them."
-                onClick={onClickEmptyState}
-              />
-            )
-          }
+          emptyState={useMemo(
+            () =>
+              !isFetchedDatasets ? (
+                <></>
+              ) : (
+                <ListEmptyStateWithButton
+                  isAdmin={isAdmin}
+                  title="You don't have any datasets yet."
+                  buttonText="New dataset"
+                  description="Datasets help you organize your data. Datasets will appear here when you create them."
+                  onClick={onClickEmptyState}
+                />
+              ),
+            [isFetchedDatasets, isAdmin, onClickEmptyState]
+          )}
         />
 
         <DatasetSelectedOptionPopup
diff --git a/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx b/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx
index 7def56745..c0cb8a065 100644
--- a/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx
+++ b/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx
@@ -116,7 +116,12 @@ export const MetricItemsContainer: React.FC<{
         columns={columns}
         onSelectChange={onSelectChange}
         selectedRowKeys={selectedRowKeys}
-        emptyState={<EmptyState loading={loading} />}
+        emptyState={useMemo(
+          () => (
+            <EmptyState loading={loading} />
+          ),
+          [loading]
+        )}
       />
 
       <MetricSelectedOptionPopup