diff --git a/Dfe.Academies.Api.Infrastructure/Repositories/EstablishmentRepository.cs b/Dfe.Academies.Api.Infrastructure/Repositories/EstablishmentRepository.cs
index 74ab6a70..3588cd8b 100644
--- a/Dfe.Academies.Api.Infrastructure/Repositories/EstablishmentRepository.cs
+++ b/Dfe.Academies.Api.Infrastructure/Repositories/EstablishmentRepository.cs
@@ -23,7 +23,7 @@ public EstablishmentRepository(MstrContext context, MisMstrContext misMstrContex
 
         public async Task<Establishment?> GetEstablishmentByUkprn(string ukprn, CancellationToken cancellationToken)
         {
-            var queryResult = await BaseQuery().SingleOrDefaultAsync(r => r.Establishment.UKPRN == ukprn);
+            var queryResult = await BaseQuery().FirstOrDefaultAsync(r => r.Establishment.UKPRN == ukprn, cancellationToken: cancellationToken);
 
             if (queryResult == null)
             {
@@ -44,7 +44,7 @@ public EstablishmentRepository(MstrContext context, MisMstrContext misMstrContex
 
         public async Task<Establishment?> GetEstablishmentByUrn(string urn, CancellationToken cancellationToken)
         {
-            var queryResult = await BaseQuery().SingleOrDefaultAsync(r => r.Establishment.URN.ToString() == urn);
+            var queryResult = await BaseQuery().FirstOrDefaultAsync(r => r.Establishment.URN.ToString() == urn, cancellationToken: cancellationToken);
 
             if (queryResult == null)
             {
diff --git a/Dfe.AcademiesApi.Client/Generated/swagger.json b/Dfe.AcademiesApi.Client/Generated/swagger.json
index 855d5dc7..dc6e60c3 100644
--- a/Dfe.AcademiesApi.Client/Generated/swagger.json
+++ b/Dfe.AcademiesApi.Client/Generated/swagger.json
@@ -3934,7 +3934,12 @@
             "$ref": "#/components/schemas/AddressDto"
           },
           "previousEstablishment": {
-            "$ref": "#/components/schemas/PreviousEstablishmentDto"
+            "nullable": true,
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/PreviousEstablishmentDto"
+              }
+            ]
           }
         }
       },
@@ -4036,7 +4041,8 @@
         "additionalProperties": false,
         "properties": {
           "urn": {
-            "type": "string"
+            "type": "string",
+            "nullable": true
           }
         }
       },