diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.svelte
index 0f2b0d477..59d265894 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.svelte
@@ -14,14 +14,16 @@
 
     $: writes = data.databaseWrites;
     $: writesTotal = data.databaseWritesTotal;
+
+    $: path = `${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${$page.params.database}/usage`;
 </script>
 
 <div class="u-flex u-flex-vertical u-gap-16">
     <Usage
-        title="Usage"
-        path={`${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${$page.params.database}/usage`}
+        {path}
         {total}
         {count}
+        title="Usage"
         countMetadata={{
             legend: 'Collections',
             title: 'Total collections'
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte
index 35e287204..8de572d9a 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte
@@ -9,21 +9,23 @@
     $: files = data.files;
     $: transformationsTotal = data.imageTransformationsTotal;
     $: transformations = data.imageTransformations;
+
+    $: path = `${base}/project-${$page.params.region}-${$page.params.project}/storage/bucket-${$page.params.bucket}/usage`;
 </script>
 
 <Usage
+    {path}
     title="Files"
-    path={`${base}/project-${$page.params.region}-${$page.params.project}/storage/bucket-${$page.params.bucket}/usage`}
-    total={filesTotal}
     count={files}
+    total={filesTotal}
     countMetadata={{
         legend: 'Files',
         title: 'Total files'
     }} />
 
 <Usage
+    {path}
     title="Image transformations"
-    path={`${base}/project-${$page.params.region}-${$page.params.project}/storage/bucket-${$page.params.bucket}/usage`}
     total={transformationsTotal}
     count={transformations}
     countMetadata={{