diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.reducer.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.reducer.ts
index 2deea52cf1..025b6bbe3b 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.reducer.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.reducer.ts
@@ -82,6 +82,10 @@ export const parameterContextListingReducer = createReducer(
             updateRequestEntity: response.requestEntity
         })
     ),
+    on(deleteParameterContextUpdateRequestSuccess, (state) => ({
+        ...state,
+        saving: false
+    })),
     on(editParameterContextComplete, (state) => {
         return produce(state, (draftState) => {
             const updateRequestEntity: ParameterContextUpdateRequestEntity | null = draftState.updateRequestEntity;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/edit-parameter-context/edit-parameter-context.component.html b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/edit-parameter-context/edit-parameter-context.component.html
index e135f6d896..26cd7a97af 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/edit-parameter-context/edit-parameter-context.component.html
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/edit-parameter-context/edit-parameter-context.component.html
@@ -72,6 +72,7 @@
                         <div class="relative h-full border">
                             <div class="absolute inset-0 overflow-y-auto p-1">
                                 <parameter-references
+                                    [disabledLinks]="(saving$ | async)!"
                                     [parameterReferences]="
                                         requestEntity.request.referencingComponents
                                     "></parameter-references>
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/fetch-parameter-provider-parameters.component.html b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/fetch-parameter-provider-parameters.component.html
index 701970b132..f317250958 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/fetch-parameter-provider-parameters.component.html
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/fetch-parameter-provider-parameters.component.html
@@ -103,6 +103,7 @@
                             <div class="relative h-full border">
                                 <div class="absolute inset-0 overflow-y-auto p-1">
                                     <parameter-references
+                                        [disabledLinks]="(saving$ | async)!"
                                         [parameterReferences]="
                                             parameterProvider.component.affectedComponents
                                         "></parameter-references>
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/controller-service-references/controller-service-references.component.html b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/controller-service-references/controller-service-references.component.html
index cbc6fac9fa..dbe6edbc28 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/controller-service-references/controller-service-references.component.html
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/controller-service-references/controller-service-references.component.html
@@ -98,9 +98,13 @@
                                 } @else {
                                     <div [ngClass]="getNonServiceStateIcon(reference.component)"></div>
                                 }
-                                <a (click)="goToReferencingComponentClicked($event, reference.component)">{{
-                                    reference.component.name
-                                }}</a>
+                                @if (!disabledLinks) {
+                                    <a (click)="goToReferencingComponentClicked($event, reference.component)">{{
+                                        reference.component.name
+                                    }}</a>
+                                } @else {
+                                    <div>{{ reference.component.name }}</div>
+                                }
                                 @if (hasBulletins(reference)) {
                                     <div
                                         class="pointer fa fa-sticky-note-o primary-color"
@@ -135,9 +139,15 @@
                                     } @else {
                                         <div [ngClass]="getServiceStateIcon(service.component)"></div>
                                     }
-                                    <a (click)="goToReferencingComponentClicked($event, service.component)">{{
-                                        service.component.name
-                                    }}</a>
+
+                                    @if (!disabledLinks) {
+                                        <a (click)="goToReferencingComponentClicked($event, service.component)">{{
+                                            service.component.name
+                                        }}</a>
+                                    } @else {
+                                        <div>{{ service.component.name }}</div>
+                                    }
+
                                     @if (hasBulletins(service)) {
                                         <div
                                             class="pointer fa fa-sticky-note-o primary-color"
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/controller-service-references/controller-service-references.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/controller-service-references/controller-service-references.component.ts
index eacb8d5d0f..f1013f1dd9 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/controller-service-references/controller-service-references.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/controller-service-references/controller-service-references.component.ts
@@ -49,6 +49,7 @@ import { MatDialogModule } from '@angular/material/dialog';
     styleUrls: ['./controller-service-references.component.scss']
 })
 export class ControllerServiceReferences {
+    @Input() disabledLinks: boolean = false;
     @Input() serviceReferences!: ControllerServiceReferencingComponentEntity[];
     @Input() goToReferencingComponent!: (component: ControllerServiceReferencingComponent) => void;
 
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/disable-controller-service/disable-controller-service.component.html b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/disable-controller-service/disable-controller-service.component.html
index 5061e35b3d..3eacb4b15f 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/disable-controller-service/disable-controller-service.component.html
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/disable-controller-service/disable-controller-service.component.html
@@ -157,6 +157,10 @@
                             <div class="relative h-full border" style="min-height: 320px">
                                 <div class="absolute inset-0 overflow-y-auto p-1">
                                     <controller-service-references
+                                        [disabledLinks]="
+                                            disableRequest.currentStep !== SetEnableStep.Completed &&
+                                            !disableRequest.error
+                                        "
                                         [serviceReferences]="controllerService.component.referencingComponents"
                                         [goToReferencingComponent]="
                                             goToReferencingComponent
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/edit-controller-service/edit-controller-service.component.html b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/edit-controller-service/edit-controller-service.component.html
index b1a933c504..d465443032 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/edit-controller-service/edit-controller-service.component.html
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/edit-controller-service/edit-controller-service.component.html
@@ -105,6 +105,7 @@
                         <div class="relative h-full border">
                             <div class="absolute inset-0 overflow-y-auto p-1">
                                 <controller-service-references
+                                    [disabledLinks]="(saving$ | async)!"
                                     [serviceReferences]="request.controllerService.component.referencingComponents"
                                     [goToReferencingComponent]="
                                         goToReferencingComponent
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/enable-controller-service/enable-controller-service.component.html b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/enable-controller-service/enable-controller-service.component.html
index 03914e28fc..f3a74bc293 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/enable-controller-service/enable-controller-service.component.html
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/enable-controller-service/enable-controller-service.component.html
@@ -170,6 +170,10 @@
                             <div class="relative h-full border" style="min-height: 320px">
                                 <div class="absolute inset-0 overflow-y-auto p-1">
                                     <controller-service-references
+                                        [disabledLinks]="
+                                            enableRequest.currentStep !== SetEnableStep.Completed &&
+                                            !enableRequest.error
+                                        "
                                         [serviceReferences]="controllerService.component.referencingComponents"
                                         [goToReferencingComponent]="
                                             goToReferencingComponent
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/parameter-references/parameter-references.component.html b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/parameter-references/parameter-references.component.html
index eefa1c3e6a..325d93cc78 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/parameter-references/parameter-references.component.html
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/parameter-references/parameter-references.component.html
@@ -66,9 +66,13 @@
                                 } @else {
                                     <div [ngClass]="getNonServiceStateIcon(reference.component)"></div>
                                 }
-                                <a [routerLink]="getRouteForReference(reference.component)">{{
-                                    reference.component.name
-                                }}</a>
+                                @if (!disabledLinks) {
+                                    <a [routerLink]="getRouteForReference(reference.component)">{{
+                                        reference.component.name
+                                    }}</a>
+                                } @else {
+                                    <div>{{ reference.component.name }}</div>
+                                }
                                 @if (hasBulletins(reference)) {
                                     <div
                                         class="pointer fa fa-sticky-note-o primary-color"
@@ -103,9 +107,13 @@
                                     } @else {
                                         <div [ngClass]="getServiceStateIcon(service.component)"></div>
                                     }
-                                    <a [routerLink]="getRouteForReference(service.component)">
-                                        {{ service.component.name }}
-                                    </a>
+                                    @if (!disabledLinks) {
+                                        <a [routerLink]="getRouteForReference(service.component)">
+                                            {{ service.component.name }}
+                                        </a>
+                                    } @else {
+                                        <div>{{ service.component.name }}</div>
+                                    }
                                     @if (hasBulletins(service)) {
                                         <div
                                             class="pointer fa fa-sticky-note-o primary-color"
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/parameter-references/parameter-references.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/parameter-references/parameter-references.component.ts
index 2963ed0816..b6effe7727 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/parameter-references/parameter-references.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/parameter-references/parameter-references.component.ts
@@ -50,6 +50,7 @@ import { BulletinsTip } from '../tooltips/bulletins-tip/bulletins-tip.component'
     styleUrls: ['./parameter-references.component.scss']
 })
 export class ParameterReferences {
+    @Input() disabledLinks: boolean = false;
     @Input() set parameterReferences(parameterReferences: AffectedComponentEntity[] | undefined) {
         // reset existing state
         this.processGroups = [];