diff --git a/src/Resources/EmbeddedResources/Address.php b/src/Resources/EmbeddedResources/Address.php
index b3231574..a86a76eb 100755
--- a/src/Resources/EmbeddedResources/Address.php
+++ b/src/Resources/EmbeddedResources/Address.php
@@ -30,7 +30,7 @@ class Address extends AbstractUnzerResource
     /** @var string country */
     protected $country;
 
-    /** @var string country */
+    /** @var string company */
     protected $company;
 
     /** @var string|null shippingType */
@@ -169,7 +169,7 @@ public function setShippingType(?string $shippingType): Address
         return $this;
     }
 
-    public function getCompany(): string
+    public function getCompany(): ?string
     {
         return $this->company;
     }
diff --git a/test/unit/Resources/CustomerTest.php b/test/unit/Resources/CustomerTest.php
index 0f11b1fb..7b17d3c6 100755
--- a/test/unit/Resources/CustomerTest.php
+++ b/test/unit/Resources/CustomerTest.php
@@ -14,15 +14,15 @@
 use UnzerSDK\Constants\CompanyCommercialSectorItems;
 use UnzerSDK\Constants\CompanyRegistrationTypes;
 use UnzerSDK\Constants\Salutations;
-use UnzerSDK\Resources\EmbeddedResources\CompanyOwner;
-use UnzerSDK\Unzer;
 use UnzerSDK\Interfaces\ResourceServiceInterface;
 use UnzerSDK\Resources\Customer;
 use UnzerSDK\Resources\EmbeddedResources\Address;
 use UnzerSDK\Resources\EmbeddedResources\CompanyInfo;
+use UnzerSDK\Resources\EmbeddedResources\CompanyOwner;
 use UnzerSDK\Resources\EmbeddedResources\GeoLocation;
 use UnzerSDK\Services\ResourceService;
 use UnzerSDK\test\BasePaymentTest;
+use UnzerSDK\Unzer;
 
 class CustomerTest extends BasePaymentTest
 {
@@ -121,6 +121,7 @@ public function settersAndGettersOfShippingAddressShouldWork(): void
             ->setCity('shipping_city')
             ->setZip('shipping_zip')
             ->setStreet('shipping_street')
+            ->setCompany('shipping_company')
             ->setShippingType('shipping_type');
 
         $customer = new Customer();
@@ -132,6 +133,7 @@ public function settersAndGettersOfShippingAddressShouldWork(): void
         $this->assertNull($shippingAddress->getZip());
         $this->assertNull($shippingAddress->getStreet());
         $this->assertNull($shippingAddress->getShippingType());
+        $this->assertNull($shippingAddress->getCompany());
 
         $customer->setShippingAddress($address);
         $shippingAddress = $customer->getShippingAddress();
@@ -142,6 +144,7 @@ public function settersAndGettersOfShippingAddressShouldWork(): void
         $this->assertEquals('shipping_zip', $shippingAddress->getZip());
         $this->assertEquals('shipping_street', $shippingAddress->getStreet());
         $this->assertEquals('shipping_type', $shippingAddress->getShippingType());
+        $this->assertEquals('shipping_company', $shippingAddress->getCompany());
     }
 
     /**