diff --git a/console/src/app/components/framework-change/framework-change-dialog.component.html b/console/src/app/components/framework-change/framework-change-dialog.component.html
index 654d55fb5..3b67f9f9d 100644
--- a/console/src/app/components/framework-change/framework-change-dialog.component.html
+++ b/console/src/app/components/framework-change/framework-change-dialog.component.html
@@ -3,7 +3,7 @@
   {{ 'QUICKSTART.DIALOG.CHANGE.DESCRIPTION' | translate }}
   <div class="framework-change-block">
     <cnsl-framework-autocomplete
-      [frameworkId]="data.framework.id"
+      [frameworkId]="data.framework?.id"
       [frameworks]="data.frameworks"
       (selectionChanged)="findFramework($event)"
     ></cnsl-framework-autocomplete>
diff --git a/console/src/app/components/framework-change/framework-change.component.html b/console/src/app/components/framework-change/framework-change.component.html
index 6c65249d2..0cb8a6cef 100644
--- a/console/src/app/components/framework-change/framework-change.component.html
+++ b/console/src/app/components/framework-change/framework-change.component.html
@@ -1,12 +1,19 @@
 <div class="framework-change-wrapper">
   <div class="framework-card-wrapper">
-    <div class="framework-card card" *ngIf="framework | async as framework">
-      <div [routerLink]="['/app-create']" [queryParams]="{ id: framework.docsLink }" class="">
+    <div class="framework-card card" *ngIf="framework | async as framework; else frameworkFallback">
+      <div>
         <img class="dark-only" *ngIf="framework.imgSrcDark" [src]="framework.imgSrcDark" />
         <img class="light-only" *ngIf="framework.imgSrcLight" [src]="framework.imgSrcLight" />
       </div>
       <span>{{ framework.title }}</span>
     </div>
+
+    <ng-template #frameworkFallback>
+      <div class="framework-card card">
+        <span>{{ 'QUICKSTART.SELECT_FRAMEWORK' | translate }}</span>
+      </div>
+    </ng-template>
+
     <button (click)="openDialog()" mat-stroked-button>
       {{ 'ACTIONS.CHANGE' | translate }}
     </button>
diff --git a/console/src/app/pages/app-create/app-create.component.ts b/console/src/app/pages/app-create/app-create.component.ts
index 8dcfeb7a3..eb345c5ee 100644
--- a/console/src/app/pages/app-create/app-create.component.ts
+++ b/console/src/app/pages/app-create/app-create.component.ts
@@ -132,9 +132,13 @@ export class AppCreateComponent implements OnDestroy {
       .addProject(project.toObject())
       .then((resp: AddProjectResponse.AsObject) => {
         this.error.set('');
-        this.router.navigate(['/projects', resp.id, 'apps', 'integrate'], {
-          queryParams: { framework: this.framework()?.id },
-        });
+        if (this.customFramework()) {
+          this.router.navigate(['/projects', resp.id, 'apps', 'create']);
+        } else if (this.framework()) {
+          this.router.navigate(['/projects', resp.id, 'apps', 'integrate'], {
+            queryParams: { framework: this.framework()?.id },
+          });
+        }
       })
       .catch((error) => {
         const { message } = error;
diff --git a/console/src/app/pages/projects/apps/integrate/integrate.component.html b/console/src/app/pages/projects/apps/integrate/integrate.component.html
index 4b2b567eb..71c2fc1f2 100644
--- a/console/src/app/pages/projects/apps/integrate/integrate.component.html
+++ b/console/src/app/pages/projects/apps/integrate/integrate.component.html
@@ -124,7 +124,7 @@
       <div class="app-integrate-actions">
         <button
           mat-raised-button
-          [disabled]="loading"
+          [disabled]="loading || !framework()"
           class="create-button"
           color="primary"
           (click)="createApp()"