diff --git a/GitVersion.yml b/GitVersion.yml
index 3d2eb69..598af7e 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,5 +1,5 @@
 mode: ContinuousDelivery
-next-version: 6.3.7
+next-version: 6.3.8
 increment: Patch
 major-version-bump-message: '\+semver:\s?(breaking|major|release)'
 minor-version-bump-message: '\+semver:\s?(feat|feature|minor)'
diff --git a/src/EasyKeys.Shipping.DHL.Abstractions/OpenApis/V2/Express/DHLExpressApi.cs b/src/EasyKeys.Shipping.DHL.Abstractions/OpenApis/V2/Express/DHLExpressApi.cs
index 378d6d8..dfda819 100644
--- a/src/EasyKeys.Shipping.DHL.Abstractions/OpenApis/V2/Express/DHLExpressApi.cs
+++ b/src/EasyKeys.Shipping.DHL.Abstractions/OpenApis/V2/Express/DHLExpressApi.cs
@@ -3979,12 +3979,12 @@ public partial class SupermodelIoLogisticsExpressAddressRatesRequest
     /// </summary>
     [Newtonsoft.Json.JsonProperty("addressLine1", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
     [System.ComponentModel.DataAnnotations.StringLength(45, MinimumLength = 1)]
-    public string AddressLine1 { get; set; }
+    public string? AddressLine1 { get; set; }
 
     /// <summary>
     /// Please enter address line 3
     /// </summary>
-    [Newtonsoft.Json.JsonProperty("addressLine2", Required = Newtonsoft.Json.Required.AllowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+    [Newtonsoft.Json.JsonProperty("addressLine2", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
     [System.ComponentModel.DataAnnotations.StringLength(45, MinimumLength = 1)]
     public string? AddressLine2 { get; set; }
 
@@ -3993,7 +3993,7 @@ public partial class SupermodelIoLogisticsExpressAddressRatesRequest
     /// </summary>
     [Newtonsoft.Json.JsonProperty("addressLine3", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
     [System.ComponentModel.DataAnnotations.StringLength(45, MinimumLength = 1)]
-    public string AddressLine3 { get; set; }
+    public string? AddressLine3 { get; set; }
 
     /// <summary>
     /// Please enter your suburb or county name
diff --git a/src/EasyKeys.Shipping.DHL.Rates/DHLExpressRateProvider.cs b/src/EasyKeys.Shipping.DHL.Rates/DHLExpressRateProvider.cs
index 6f6ab65..fe9b921 100644
--- a/src/EasyKeys.Shipping.DHL.Rates/DHLExpressRateProvider.cs
+++ b/src/EasyKeys.Shipping.DHL.Rates/DHLExpressRateProvider.cs
@@ -111,9 +111,9 @@ public async Task<Shipment> GetRatesManyAsync(Shipment shipment, CancellationTok
                         PostalCode = shipment.DestinationAddress.PostalCode,
                         CityName = shipment.DestinationAddress.City,
                         CountryCode = shipment.DestinationAddress.CountryCode,
-                        AddressLine1 = shipment.DestinationAddress.StreetLine,
+                        AddressLine1 = string.IsNullOrEmpty(shipment.DestinationAddress.StreetLine) ? null : shipment.DestinationAddress.StreetLine,
                         AddressLine2 = string.IsNullOrEmpty(shipment.DestinationAddress.StreetLine2) ? null : shipment.DestinationAddress.StreetLine2,
-                        AddressLine3 = shipment.DestinationAddress.StateOrProvince
+                        AddressLine3 = string.IsNullOrEmpty(shipment.DestinationAddress.StateOrProvince) ? null : shipment.DestinationAddress.StateOrProvince
                     }
                 },
                 Accounts = new[]
diff --git a/test/EasyKeys.Shipping.FuncTest/TestHelpers/TestShipments.cs b/test/EasyKeys.Shipping.FuncTest/TestHelpers/TestShipments.cs
index d9f127e..e0af24d 100644
--- a/test/EasyKeys.Shipping.FuncTest/TestHelpers/TestShipments.cs
+++ b/test/EasyKeys.Shipping.FuncTest/TestHelpers/TestShipments.cs
@@ -64,7 +64,7 @@ public static Shipment CreateInternationalShipment()
             stateOrProvince: "ON",
             postalCode: "K1M 1M4",
             countryCode: "CA");
-        destinationAddress = new Address("285 Wang Fu Jing Avenue", "BEIJING", "Beijing", "100006", "CN", isResidential: false); 
+        destinationAddress = new Address("285 Wang Fu Jing Avenue", "BEIJING", "", "100006", "CN", isResidential: false);
         var packages = new List<Package>
         {
             new Package(