diff --git a/apps/nextjs/src/app/[locale]/init/_steps/integrations/init-integrations.tsx b/apps/nextjs/src/app/[locale]/init/_steps/integrations/init-integrations.tsx
index 2a188ef5d..98c4976a4 100644
--- a/apps/nextjs/src/app/[locale]/init/_steps/integrations/init-integrations.tsx
+++ b/apps/nextjs/src/app/[locale]/init/_steps/integrations/init-integrations.tsx
@@ -57,8 +57,13 @@ export const InitIntegrations = () => {
   if (phase === "configure") {
     const currentKind = selectedKinds[currentIndex];
     if (currentKind === undefined) {
-      setPhase("done");
-      return <></>;
+      return (
+        <Card w={64 * 14} maw="90vw" withBorder>
+          <Center py="xl">
+            <Loader />
+          </Center>
+        </Card>
+      );
     }
 
     return (
diff --git a/apps/nextjs/src/components/integration/integration-multi-select-grid.tsx b/apps/nextjs/src/components/integration/integration-multi-select-grid.tsx
index 3e5c542ae..3f0972f6a 100644
--- a/apps/nextjs/src/components/integration/integration-multi-select-grid.tsx
+++ b/apps/nextjs/src/components/integration/integration-multi-select-grid.tsx
@@ -16,9 +16,10 @@ interface IntegrationMultiSelectGridProps {
 }
 
 const getWidgetsByIntegration = () => {
-  const map = Object.fromEntries(
-    integrationKinds.map((kind) => [kind, [] as WidgetKind[]]),
-  ) as Record<IntegrationKind, WidgetKind[]>;
+  const map = Object.fromEntries(integrationKinds.map((kind) => [kind, [] as WidgetKind[]])) as Record<
+    IntegrationKind,
+    WidgetKind[]
+  >;
 
   for (const [widgetKind, widget] of Object.entries(widgetImports) as [
     WidgetKind,
diff --git a/apps/nextjs/src/components/integration/integration-select-grid.tsx b/apps/nextjs/src/components/integration/integration-select-grid.tsx
index e846b54e5..8637137de 100644
--- a/apps/nextjs/src/components/integration/integration-select-grid.tsx
+++ b/apps/nextjs/src/components/integration/integration-select-grid.tsx
@@ -16,9 +16,10 @@ interface IntegrationSelectGridProps {
 }
 
 const getWidgetsByIntegration = () => {
-  const map = Object.fromEntries(
-    integrationKinds.map((kind) => [kind, [] as WidgetKind[]]),
-  ) as Record<IntegrationKind, WidgetKind[]>;
+  const map = Object.fromEntries(integrationKinds.map((kind) => [kind, [] as WidgetKind[]])) as Record<
+    IntegrationKind,
+    WidgetKind[]
+  >;
 
   for (const [widgetKind, widget] of Object.entries(widgetImports) as [
     WidgetKind,
diff --git a/packages/api/src/router/onboard/onboard-router.ts b/packages/api/src/router/onboard/onboard-router.ts
index 140d2205b..bf733b920 100644
--- a/packages/api/src/router/onboard/onboard-router.ts
+++ b/packages/api/src/router/onboard/onboard-router.ts
@@ -177,6 +177,6 @@ export const onboardRouter = createTRPCRouter({
       }
     }
 
-    await nextOnboardingStepAsync(db, undefined);
+    await nextOnboardingStepAsync(db);
   }),
 });