diff --git a/src/containers/Tenants/Tenants.tsx b/src/containers/Tenants/Tenants.tsx
index 69e744892..2658a2776 100644
--- a/src/containers/Tenants/Tenants.tsx
+++ b/src/containers/Tenants/Tenants.tsx
@@ -302,10 +302,7 @@ function getDBActionsColumn({
         render: ({row}) => {
             const menuItems: (DropdownMenuItem | DropdownMenuItem[])[] = [];
 
-            const databaseId = row.UserAttributes?.database_id;
-            const databaseName = row.Name;
-
-            if (clusterName && isEditDBAvailable) {
+            if (isEditDBAvailable) {
                 menuItems.push({
                     text: i18n('edit'),
                     iconStart: <Pencil />,
@@ -317,15 +314,14 @@ function getDBActionsColumn({
                     },
                 });
             }
-            if (clusterName && isDeleteDBAvailable && databaseName && databaseId) {
+            if (isDeleteDBAvailable) {
                 menuItems.push({
                     text: i18n('remove'),
                     iconStart: <TrashBin />,
                     action: () => {
                         uiFactory.onDeleteDB?.({
                             clusterName,
-                            databaseId,
-                            databaseName,
+                            databaseData: row,
                         });
                     },
                     className: b('remove-db'),
diff --git a/src/uiFactory/types.ts b/src/uiFactory/types.ts
index 1d718bebf..366889ce1 100644
--- a/src/uiFactory/types.ts
+++ b/src/uiFactory/types.ts
@@ -21,6 +21,5 @@ export type HandleEditDB = (params: {
 
 export type HandleDeleteDB = (params: {
     clusterName: string;
-    databaseName: string;
-    databaseId: string;
+    databaseData: PreparedTenant;
 }) => Promise<boolean>;