diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 889d499c..e210f4d7 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1057,14 +1057,7 @@ export type DataEntryAgentDescriptionQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryAgentDescriptionQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, isGroup: boolean, gender?: { __typename?: 'AgentDescriptionGenderType', id: string, gender: Gender, sourceMention: SourceMention, note: string } | null, location?: { __typename?: 'AgentDescriptionLocationType', id: string, sourceMention: SourceMention, note: string, location: { __typename?: 'SpaceDescriptionType', id: string } } | null, source: { __typename?: 'SourceType', id: string } } | null };
-
-export type LocationsInSourceListQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
-}>;
-
-
-export type LocationsInSourceListQuery = { __typename?: 'Query', spaceDescriptions: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> };
+export type DataEntryAgentDescriptionQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, isGroup: boolean, gender?: { __typename?: 'AgentDescriptionGenderType', id: string, gender: Gender, sourceMention: SourceMention, note: string } | null, location?: { __typename?: 'AgentDescriptionLocationType', id: string, sourceMention: SourceMention, note: string, location: { __typename?: 'SpaceDescriptionType', id: string } } | null, source: { __typename?: 'SourceType', id: string, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> } } | null };
 
 export type DataEntryAgentEpisodesQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1437,6 +1430,10 @@ export const DataEntryAgentDescriptionDocument = gql`
     }
     source {
       id
+      spaces {
+        id
+        name
+      }
     }
   }
 }
@@ -1448,25 +1445,6 @@ export const DataEntryAgentDescriptionDocument = gql`
   export class DataEntryAgentDescriptionGQL extends Apollo.Query<DataEntryAgentDescriptionQuery, DataEntryAgentDescriptionQueryVariables> {
     override document = DataEntryAgentDescriptionDocument;
     
-    constructor(apollo: Apollo.Apollo) {
-      super(apollo);
-    }
-  }
-export const LocationsInSourceListDocument = gql`
-    query LocationsInSourceList($id: ID!) {
-  spaceDescriptions(sourceId: $id) {
-    id
-    name
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class LocationsInSourceListGQL extends Apollo.Query<LocationsInSourceListQuery, LocationsInSourceListQueryVariables> {
-    override document = LocationsInSourceListDocument;
-    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
index 8a5468d2..edc84d0b 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
@@ -57,7 +57,7 @@ <h3>Location</h3>
                 <select class="form-select" id="input-location"
                     [formControl]="form.controls.location.controls.location">
                     <ng-container *ngIf="locations$ | async as locationData">
-                        <option *ngFor="let location of locationData.spaceDescriptions"
+                        <option *ngFor="let location of locationData"
                             [value]="location.id">
                             {{location.name}}
                         </option>
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index c9835530..f91f9a46 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -10,8 +10,6 @@ import {
     DataEntryUpdateAgentMutation,
     Gender,
     SourceMention,
-    LocationsInSourceListGQL,
-    LocationsInSourceListQuery,
     UpdateAgentInput,
 } from 'generated/graphql';
 import { Observable, map, switchMap, shareReplay, filter, debounceTime, distinctUntilChanged, withLatestFrom, BehaviorSubject, tap, skip } from 'rxjs';
@@ -48,11 +46,11 @@ export class AgentDescriptionFormComponent implements OnDestroy {
             location: new FormControl<string | null>(null),
             sourceMention: new FormControl<SourceMention>(SourceMention.Direct),
             note: new FormControl<string>('', { updateOn: 'blur' }),
-        })
+        }),
     });
 
     isGroup$: Observable<boolean>;
-    locations$: Observable<LocationsInSourceListQuery>;
+    locations$: Observable<{ id: string, name: string }[]>;
 
     status$ = new BehaviorSubject<FormStatus>('idle');
 
@@ -62,7 +60,6 @@ export class AgentDescriptionFormComponent implements OnDestroy {
 
     constructor(
         private agentQuery: DataEntryAgentDescriptionGQL,
-        private locationsQuery: LocationsInSourceListGQL,
         private agentMutation: DataEntryUpdateAgentGQL,
         private toastService: ToastService,
         private formService: FormService,
@@ -78,10 +75,8 @@ export class AgentDescriptionFormComponent implements OnDestroy {
             map(result => result.agentDescription?.isGroup || false),
         );
         this.locations$ = this.data$.pipe(
-            map(data => data.agentDescription?.source.id),
+            map(data => data.agentDescription?.source.spaces),
             filter(_.negate(_.isUndefined)),
-            switchMap(id => this.locationsQuery.watch({ id }).valueChanges),
-            map(result => result.data),
             shareReplay(1),
         );
         this.data$.subscribe(this.updateFormData.bind(this));
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql
index 79d1d26d..06058b97 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql
@@ -18,6 +18,10 @@ query DataEntryAgentDescription($id: ID!) {
     }
     source {
         id
+        spaces {
+            id
+            name
+        }
     }
   }
 }
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/locations-in-source.graphql b/frontend/src/app/data-entry/agent-form/agent-description-form/locations-in-source.graphql
deleted file mode 100644
index a3248d89..00000000
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/locations-in-source.graphql
+++ /dev/null
@@ -1,6 +0,0 @@
-query LocationsInSourceList($id: ID!) {
-    spaceDescriptions(sourceId: $id) {
-        id
-        name
-    }
-}