diff --git a/src/app/organization/loan-originators/edit-loan-originator/edit-loan-originator.component.ts b/src/app/organization/loan-originators/edit-loan-originator/edit-loan-originator.component.ts
index b0799cf1e..52d3f8bd7 100644
--- a/src/app/organization/loan-originators/edit-loan-originator/edit-loan-originator.component.ts
+++ b/src/app/organization/loan-originators/edit-loan-originator/edit-loan-originator.component.ts
@@ -35,7 +35,7 @@ export class EditLoanOriginatorComponent implements OnInit {
   private router = inject(Router);
 
   /** Loan Originator form. */
-  loanOriginatorForm: UntypedFormGroup;
+  loanOriginatorForm: UntypedFormGroup | null = null;
   /** Form data. */
   loanOriginatorsData: LoanOriginator;
   loanOriginatorsTemplateData: any;
@@ -88,10 +88,10 @@ export class EditLoanOriginatorComponent implements OnInit {
         Validators.required
       ],
       originatorTypeId: [
-        this.loanOriginatorsData.originatorType.id
+        this.loanOriginatorsData.originatorType?.id
       ],
       channelTypeId: [
-        this.loanOriginatorsData.channelType.id
+        this.loanOriginatorsData.channelType?.id
       ]
     });
   }
diff --git a/src/app/organization/loan-originators/view-loan-originator/view-loan-originator.component.html b/src/app/organization/loan-originators/view-loan-originator/view-loan-originator.component.html
index a41c99707..f0d453d81 100644
--- a/src/app/organization/loan-originators/view-loan-originator/view-loan-originator.component.html
+++ b/src/app/organization/loan-originators/view-loan-originator/view-loan-originator.component.html
@@ -46,7 +46,7 @@
         </div>
 
         <div class="flex-50">
-          {{ loanOriginatorData.originatorType.name }}
+          {{ loanOriginatorData.originatorType?.name }}
         </div>
 
         <div class="flex-50 mat-body-strong">
@@ -54,9 +54,15 @@
         </div>
 
         <div class="flex-50">
-          {{ loanOriginatorData.channelType.name }}
+          {{ loanOriginatorData.channelType?.name }}
         </div>
       </div>
     </mat-card-content>
+
+    <mat-card-actions class="layout-row align-center gap-5px responsive-column">
+      <button type="button" mat-raised-button [routerLink]="['../']">
+        {{ 'labels.buttons.Back' | translate }}
+      </button>
+    </mat-card-actions>
   </mat-card>
 </div>