diff --git a/frontend/components/dashboard/table/DashboardTableRewards.vue b/frontend/components/dashboard/table/DashboardTableRewards.vue
index c86e377ed..4a04f9d40 100644
--- a/frontend/components/dashboard/table/DashboardTableRewards.vue
+++ b/frontend/components/dashboard/table/DashboardTableRewards.vue
@@ -155,10 +155,7 @@ const findNextEpochDuties = (epoch: number) => {
       <template #table>
         <ClientOnly fallback-tag="span">
           <BcTable
-            :data="wrapWithIdentifier(
-              rewards,
-              row => `${row.epoch}-${row.group_id}`,
-            )"
+            :data="wrapWithIdentifier(rewards, 'epoch', 'group_id')"
             data-key="wrapped_identifier"
             :expandable="true"
             class="rewards-table"
diff --git a/frontend/components/notifications/DashboardsTable.vue b/frontend/components/notifications/DashboardsTable.vue
index 1ca4e78f8..c918f3b34 100644
--- a/frontend/components/notifications/DashboardsTable.vue
+++ b/frontend/components/notifications/DashboardsTable.vue
@@ -61,10 +61,7 @@ const { overview } = useNotificationsDashboardOverviewStore()
       <template #table>
         <ClientOnly fallback-tag="span">
           <BcTable
-            :data="wrapWithIdentifier(
-              notificationsDashboards,
-              row => `${row.is_account_dashboard}-${row.dashboard_id}-${row.group_id}-${row.epoch}`,
-            )"
+            :data="wrapWithIdentifier(notificationsDashboards, 'is_account_dashboard', 'dashboard_id', 'group_id', 'epoch')"
             data-key="wrapped_identifier"
             :expandable="!colsVisible.notifications"
             :cursor
diff --git a/frontend/utils/wrapWithIdentifier.ts b/frontend/utils/wrapWithIdentifier.ts
index 4bbee8340..b398ff1f0 100644
--- a/frontend/utils/wrapWithIdentifier.ts
+++ b/frontend/utils/wrapWithIdentifier.ts
@@ -5,14 +5,14 @@ import type { ApiPagingResponse } from '~/types/api/common'
  * @param getIdFromRow A function that takes a row and builds a unique identifier
  * @returns The wrapped response
  */
-export function wrapWithIdentifier<T>(response: ApiPagingResponse<T> | undefined, getIdFromRow: (row: T) => string) {
+export function wrapWithIdentifier<T>(response: ApiPagingResponse<T> | undefined, ...keys: (keyof T)[]) {
   if (!response) {
     return
   }
   return {
     data: response.data.map(row => ({
       ...row,
-      wrapped_identifier: getIdFromRow(row),
+      wrapped_identifier: keys.map(key => row[key]).join('-'),
     })),
     paging: response.paging,
   }