diff --git a/angular/projects/admin/src/app/agencies/edit-agency.component.html b/angular/projects/admin/src/app/agencies/edit-agency.component.html
index 5f66afd9..86b02dd1 100644
--- a/angular/projects/admin/src/app/agencies/edit-agency.component.html
+++ b/angular/projects/admin/src/app/agencies/edit-agency.component.html
@@ -13,7 +13,13 @@ <h1 class="h2">Edit Agency</h1>
   <shared-form *ngIf="id" type="agencies" [id]="id" (load)="onLoad($event)">
     <ng-template let-record="record" let-error="error">
       <div *ngIf="states.length > 0" class="mb-3">
-        <shared-select-field id="stateId" label="State" [source]="record" [target]="record" [error]="error">
+        <shared-select-field
+          id="stateId"
+          label="State"
+          [source]="record"
+          [target]="record"
+          [error]="error"
+          (valueChange)="onStateChange($event)">
           <option *ngFor="let state of states" [value]="state.id">{{ state.name }}</option>
         </shared-select-field>
       </div>
@@ -33,7 +39,8 @@ <h1 class="h2">Edit Agency</h1>
           [target]="record"
           [error]="error"
           objectNameProperty="displayVersion"
-          objectApiPath="nemsisStateDataSets"></shared-object-field>
+          objectApiPath="nemsisStateDataSets"
+          [objectApiSearchParams]="stateSearchParams"></shared-object-field>
       </div>
       <div class="mb-3">
         <shared-text-field
diff --git a/angular/projects/admin/src/app/agencies/edit-agency.component.ts b/angular/projects/admin/src/app/agencies/edit-agency.component.ts
index cef926ea..dcc9f535 100644
--- a/angular/projects/admin/src/app/agencies/edit-agency.component.ts
+++ b/angular/projects/admin/src/app/agencies/edit-agency.component.ts
@@ -14,6 +14,7 @@ export class EditAgencyComponent {
   states: any = [];
   canonicalAgencyId: string = '';
   claimedAgencyId: string = '';
+  stateSearchParams = new HttpParams();
 
   constructor(
     private api: ApiService,
@@ -29,5 +30,16 @@ export class EditAgencyComponent {
   onLoad(agency: any) {
     this.canonicalAgencyId = agency.canonicalAgencyId;
     this.claimedAgencyId = agency.claimedAgency?.id;
+    this.stateSearchParams = new HttpParams();
+    if (agency.stateId) {
+      this.stateSearchParams = this.stateSearchParams.set('stateId', agency.stateId);
+    }
+  }
+
+  onStateChange(stateId: string | undefined) {
+    this.stateSearchParams = new HttpParams();
+    if (stateId) {
+      this.stateSearchParams = this.stateSearchParams.set('stateId', stateId);
+    }
   }
 }