diff --git a/source/frontend/src/features/mapSideBar/acquisition/common/models.ts b/source/frontend/src/features/mapSideBar/acquisition/common/models.ts
index f539b9d4dd..9b29bc358b 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/common/models.ts
+++ b/source/frontend/src/features/mapSideBar/acquisition/common/models.ts
@@ -53,9 +53,9 @@ export class AcquisitionTeamFormModel {
 
   static fromApi(model: Api_AcquisitionFileTeam | null): AcquisitionTeamFormModel {
     const contact: IContactSearchResult | undefined =
-      model?.person !== undefined
+      model?.person !== undefined && model?.person !== null
         ? fromApiPerson(model.person)
-        : model?.organization !== undefined
+        : model?.organization !== undefined && model?.organization !== null
         ? fromApiOrganization(model.organization)
         : undefined;
 
diff --git a/source/frontend/src/features/mapSideBar/disposition/models/DispositionTeamSubFormModel.ts b/source/frontend/src/features/mapSideBar/disposition/models/DispositionTeamSubFormModel.ts
index 6a303a2e2f..08e6f15ce4 100644
--- a/source/frontend/src/features/mapSideBar/disposition/models/DispositionTeamSubFormModel.ts
+++ b/source/frontend/src/features/mapSideBar/disposition/models/DispositionTeamSubFormModel.ts
@@ -22,6 +22,7 @@ export class DispositionTeamSubFormModel {
     readonly rowVersion: number | null = null,
     contact: IContactSearchResult | null = null,
   ) {
+    debugger;
     this.id = id;
     this.rowVersion = rowVersion;
     this.contact = contact;
@@ -53,9 +54,9 @@ export class DispositionTeamSubFormModel {
 
   static fromApi(model: Api_DispositionFileTeam | null): DispositionTeamSubFormModel {
     const contact: IContactSearchResult | undefined =
-      model?.person !== undefined
+      model?.person !== undefined && model?.person !== null
         ? fromApiPerson(model.person)
-        : model?.organization !== undefined
+        : model?.organization !== undefined && model?.organization !== null
         ? fromApiOrganization(model.organization)
         : undefined;