diff --git a/src/lib/wizards/functions/steps/createRepository.svelte b/src/lib/wizards/functions/steps/createRepository.svelte
index d6126890c..e5610476d 100644
--- a/src/lib/wizards/functions/steps/createRepository.svelte
+++ b/src/lib/wizards/functions/steps/createRepository.svelte
@@ -50,7 +50,7 @@
         const callbackState = {
             from: 'github',
             to: 'template',
-            step: '4',
+            step: '5',
             template: $template.id,
             templateConfig: JSON.stringify($templateConfig)
         };
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
index 7941d2040..d1fbdf0ee 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
@@ -149,7 +149,9 @@
                             }
                         }
                     ]} />
-                <ProjectBreakdown projects={project} metric="bandwidth" {data} />
+                {#if project?.length > 0}
+                    <ProjectBreakdown projects={project} metric="bandwidth" {data} />
+                {/if}
             {:else}
                 <Card isDashed>
                     <div class="u-flex u-cross-center u-flex-vertical u-main-center u-flex">
@@ -198,7 +200,9 @@
                             )
                         }
                     ]} />
-                <ProjectBreakdown projects={project} metric="users" {data} />
+                {#if project?.length > 0}
+                    <ProjectBreakdown projects={project} metric="users" {data} />
+                {/if}
             {:else}
                 <Card isDashed>
                     <div class="u-flex u-cross-center u-flex-vertical u-main-center u-flex">
@@ -248,7 +252,9 @@
                             ]
                         }
                     ]} />
-                <ProjectBreakdown projects={project} metric="executions" {data} />
+                {#if project?.length > 0}
+                    <ProjectBreakdown projects={project} metric="executions" {data} />
+                {/if}
             {:else}
                 <Card isDashed>
                     <div class="u-flex u-cross-center u-flex-vertical u-main-center u-flex">
@@ -284,7 +290,9 @@
                     progressValue={bytesToSize(current, 'GB')}
                     progressMax={max}
                     minimum={1} />
-                <ProjectBreakdown projects={project} metric="storage" {data} />
+                {#if project?.length > 0}
+                    <ProjectBreakdown projects={project} metric="storage" {data} />
+                {/if}
             {:else}
                 <Card isDashed>
                     <div class="u-flex u-cross-center u-flex-vertical u-main-center u-flex">