diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/index.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/index.ts
index d6013e9f0d..86047add7a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/index.ts
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/index.ts
@@ -42,6 +42,12 @@ export interface StateEntry {
     clusterNodeAddress?: string;
 }
 
+export interface StateItem {
+    key: string;
+    value: string;
+    scope?: string;
+}
+
 export interface StateMap {
     scope: string;
     state: StateEntry[];
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.html
index 3ec36528de..f091aac161 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.html
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.html
@@ -73,6 +73,16 @@
                             </td>
                         </ng-container>
 
+                        <!-- Scope Column -->
+                        @if (displayedColumns.includes('scope')) {
+                            <ng-container matColumnDef="scope">
+                                <th mat-header-cell *matHeaderCellDef mat-sort-header>Scope</th>
+                                <td mat-cell *matCellDef="let item" [title]="item.scope">
+                                    {{ item.scope }}
+                                </td>
+                            </ng-container>
+                        }
+
                         <tr mat-header-row *matHeaderRowDef="displayedColumns; sticky: true"></tr>
                         <tr
                             mat-row
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.ts
index 9b82b0d57d..e28e72bd01 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.ts
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.ts
@@ -24,7 +24,7 @@ import { MatSortModule, Sort } from '@angular/material/sort';
 import { AsyncPipe } from '@angular/common';
 import { NifiTooltipDirective } from '../tooltips/nifi-tooltip.directive';
 import { NifiSpinnerDirective } from '../spinner/nifi-spinner.directive';
-import { ComponentStateState, StateEntry, StateMap } from '../../../state/component-state';
+import { ComponentStateState, StateEntry, StateItem, StateMap } from '../../../state/component-state';
 import { Store } from '@ngrx/store';
 import { clearComponentState } from '../../../state/component-state/component-state.actions';
 import {
@@ -38,6 +38,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormBuilder, FormGroup, ReactiveFormsModule } from '@angular/forms';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
+import { selectClusterSummary } from '../../../state/cluster-summary/cluster-summary.selectors';
 
 @Component({
     selector: 'component-state',
@@ -64,9 +65,8 @@ export class ComponentStateDialog implements AfterViewInit {
     componentName$: Observable<string> = this.store.select(selectComponentName).pipe(isDefinedAndNotNull());
     canClear$: Observable<boolean> = this.store.select(selectCanClear).pipe(isDefinedAndNotNull());
 
-    // TODO - need to include scope column when clustered
     displayedColumns: string[] = ['key', 'value'];
-    dataSource: MatTableDataSource<StateEntry> = new MatTableDataSource<StateEntry>();
+    dataSource: MatTableDataSource<StateItem> = new MatTableDataSource<StateItem>();
 
     filterForm: FormGroup;
 
@@ -89,17 +89,17 @@ export class ComponentStateDialog implements AfterViewInit {
             .subscribe((componentState) => {
                 this.stateDescription = componentState.stateDescription;
 
-                const stateItems: StateEntry[] = [];
+                const stateItems: StateItem[] = [];
                 if (componentState.localState) {
-                    const localStateItems: StateEntry[] = this.processStateMap(componentState.localState);
+                    const localStateItems: StateItem[] = this.processStateMap(componentState.localState, false);
                     stateItems.push(...localStateItems);
                 }
                 if (componentState.clusterState) {
-                    const clusterStateItems: StateEntry[] = this.processStateMap(componentState.clusterState);
+                    const clusterStateItems: StateItem[] = this.processStateMap(componentState.clusterState, true);
                     stateItems.push(...clusterStateItems);
                 }
 
-                this.dataSource.data = this.sortStateEntries(stateItems, {
+                this.dataSource.data = this.sortStateItems(stateItems, {
                     active: this.initialSortColumn,
                     direction: this.initialSortDirection
                 });
@@ -111,6 +111,24 @@ export class ComponentStateDialog implements AfterViewInit {
                     this.applyFilter(filterTerm);
                 }
             });
+
+        this.store
+            .select(selectClusterSummary)
+            .pipe(isDefinedAndNotNull(), takeUntilDestroyed())
+            .subscribe((clusterSummary) => {
+                if (clusterSummary.connectedToCluster) {
+                    // if we're connected to the cluster add a scope column if it's not already present
+                    if (!this.displayedColumns.includes('scope')) {
+                        this.displayedColumns.splice(this.displayedColumns.length, 0, 'scope');
+                    }
+                } else {
+                    // if we're not connected to the cluster remove the scope column if it is present
+                    const nodeIndex = this.displayedColumns.indexOf('scope');
+                    if (nodeIndex > -1) {
+                        this.displayedColumns.splice(nodeIndex, 1);
+                    }
+                }
+            });
     }
 
     ngAfterViewInit(): void {
@@ -122,16 +140,22 @@ export class ComponentStateDialog implements AfterViewInit {
             });
     }
 
-    processStateMap(stateMap: StateMap): StateEntry[] {
-        const stateItems: StateEntry[] = stateMap.state ? stateMap.state : [];
+    processStateMap(stateMap: StateMap, clusterState: boolean): StateItem[] {
+        const stateEntries: StateEntry[] = stateMap.state ? stateMap.state : [];
 
-        if (stateItems.length !== stateMap.totalEntryCount) {
+        if (stateEntries.length !== stateMap.totalEntryCount) {
             this.partialResults = true;
         }
 
         this.totalEntries += stateMap.totalEntryCount;
 
-        return stateItems;
+        return stateEntries.map((stateEntry) => {
+            return {
+                key: stateEntry.key,
+                value: stateEntry.value,
+                scope: clusterState ? 'Cluster' : stateEntry.clusterNodeAddress
+            };
+        });
     }
 
     applyFilter(filterTerm: string) {
@@ -140,10 +164,10 @@ export class ComponentStateDialog implements AfterViewInit {
     }
 
     sortData(sort: Sort) {
-        this.dataSource.data = this.sortStateEntries(this.dataSource.data, sort);
+        this.dataSource.data = this.sortStateItems(this.dataSource.data, sort);
     }
 
-    private sortStateEntries(data: StateEntry[], sort: Sort): StateEntry[] {
+    private sortStateItems(data: StateItem[], sort: Sort): StateItem[] {
         if (!data) {
             return [];
         }
@@ -158,6 +182,11 @@ export class ComponentStateDialog implements AfterViewInit {
                 case 'value':
                     retVal = this.nifiCommon.compareString(a.value, b.value);
                     break;
+                case 'scope':
+                    if (a.scope && b.scope) {
+                        retVal = this.nifiCommon.compareString(a.scope, b.scope);
+                    }
+                    break;
             }
             return retVal * (isAsc ? 1 : -1);
         });