diff --git a/src/containers/Tenant/Tenant.tsx b/src/containers/Tenant/Tenant.tsx
index bb897af5ff..0c1bb8b717 100644
--- a/src/containers/Tenant/Tenant.tsx
+++ b/src/containers/Tenant/Tenant.tsx
@@ -52,16 +52,7 @@ export function Tenant(props: TenantProps) {
         getTenantSummaryState,
     );
 
-    // TODO: name is used together with database to keep old links valid, do not remove
-    const {database: queryDatabase, schema, name, handleDatabaseChange} = useTenantQueryParams();
-
-    React.useEffect(() => {
-        if (name && !queryDatabase) {
-            handleDatabaseChange(name);
-        }
-    }, [queryDatabase, name, handleDatabaseChange]);
-
-    const database = queryDatabase ?? name;
+    const {database, schema} = useTenantQueryParams();
 
     if (!database) {
         throw new Error('Tenant name is not defined');
diff --git a/src/containers/Tenant/useTenantQueryParams.ts b/src/containers/Tenant/useTenantQueryParams.ts
index c6ed23a16e..e5715c4845 100644
--- a/src/containers/Tenant/useTenantQueryParams.ts
+++ b/src/containers/Tenant/useTenantQueryParams.ts
@@ -61,10 +61,16 @@ export function useTenantQueryParams() {
         [setQueryParams],
     );
 
+    React.useEffect(() => {
+        if (name && !database) {
+            setQueryParams({database: name, name: undefined}, 'replaceIn');
+        }
+    }, [database, name, setQueryParams]);
+
     return {
         showHealthcheck,
         handleShowHealthcheckChange,
-        database,
+        database: database || name,
         handleDatabaseChange,
         showGrantAccess,
         handleShowGrantAccessChange,
@@ -76,6 +82,5 @@ export function useTenantQueryParams() {
         handleIssuesFilterChange,
         aclSubject,
         handleAclSubjectChange,
-        name,
     };
 }