diff --git a/cllc-public-app/ClientApp/src/app/components/applications/application-tied-house-exemption/application-tied-house-exemption.component.ts b/cllc-public-app/ClientApp/src/app/components/applications/application-tied-house-exemption/application-tied-house-exemption.component.ts
index 3e8d0f7733..901badd1fb 100644
--- a/cllc-public-app/ClientApp/src/app/components/applications/application-tied-house-exemption/application-tied-house-exemption.component.ts
+++ b/cllc-public-app/ClientApp/src/app/components/applications/application-tied-house-exemption/application-tied-house-exemption.component.ts
@@ -232,9 +232,6 @@ export class ApplicationTiedHouseExemptionComponent extends FormBase implements
     const assignedJobNumber = this.form.get("assignedLicence.jobNumber").value;
 
 
-    console.log("Tied House Exemption===> Save: licenceId: " + this.licenceId + ", assignedLicenceId: " + assignedLicenceId + ", assignedLicenceNumber: " + assignedLicenceNumber + ", assignedJobNumber: " + assignedJobNumber);
-
-
     if (!this.licenceId) {
       this.application.parentApplicationId = this.applicationId;
       const applicationType = this.applicationType;
diff --git a/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.html b/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.html
index 99fc2d54af..ae43106900 100644
--- a/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.html
+++ b/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.html
@@ -3039,16 +3039,16 @@ <h3>LG/IN Review Complete </h3>
             </button>
 
             <!-- NEXT STEP BUTTONS
-    LG Approval Required -- > Submit to LG For Approval
+  LG Approval Required -- > Submit to LG For Approval
 
-    No LG Approvals Required
-    No Security Screening Required -- > Submit & Pay
-    Security Screening Required    -- > Proceed to Security Screening
-    LG Approved
-    No Security Screening Required -- > Submit & Pay
-    Security Screening Required    -- > Proceed to Security Screening
+  No LG Approvals Required
+  No Security Screening Required -- > Submit & Pay
+  Security Screening Required    -- > Proceed to Security Screening
+  LG Approved
+  No Security Screening Required -- > Submit & Pay
+  Security Screening Required    -- > Proceed to Security Screening
 
-    -->
+  -->
             <!-- LG Approval Required -->
             <button mat-raised-button class="ng-test-submit-for-lg-review" color="primary"
                     *ngIf="showSubmitToLG()"
@@ -3060,7 +3060,8 @@ <h3>LG/IN Review Complete </h3>
             <!-- LG Approved OR NO LG Approvals Required -->
             <ng-container *ngIf="lGHasApproved() || ((!application?.applicationType?.isShowLGINApproval && !application?.applicationType?.isShowLGZoningConfirmation) || !showSubmitToLG())">
 
-              <button mat-raised-button *ngIf="!application?.applicationType?.requiresSecurityScreening" color="primary"
+              <!--LCSD-7008: 2024-05-01 waynezen dont show Submit & Pay if Invoice Trigger has already run -->
+              <button mat-raised-button *ngIf="!application?.applicationType?.requiresSecurityScreening && !hasInvoiceTriggerRun()" color="primary"
                       (click)="submit_application()" [disabled]="submitApplicationInProgress">
                 SUBMIT&nbsp;<span *ngIf="!isFreeEndorsement() && !application?.applicationType?.isFree &&  !skipPayment && !isRAS()">&amp; PAY</span>
                 <mat-progress-bar *ngIf="submitApplicationInProgress" mode="indeterminate"></mat-progress-bar>
diff --git a/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.ts b/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.ts
index c5c323cb62..f85101eba0 100644
--- a/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.ts
+++ b/cllc-public-app/ClientApp/src/app/components/applications/application/application.component.ts
@@ -1257,6 +1257,15 @@ export class ApplicationComponent extends FormBase implements OnInit {
     return isAllowed;
   }
 
+  /**
+   * LCSD-7008: 2024-05-01 waynezen: prevent check if Dynamics 365 Invoice generation workflow has already run
+   */
+  private hasInvoiceTriggerRun(): boolean {
+    const hasRun: boolean = (
+      this?.application?.invoiceTrigger === 1)
+
+    return hasRun;
+  }
 
   /**
    * Redirect to payment processing page (Express Pay / Bambora service)