diff --git a/src/Model/Table/AddressesTable.php b/src/Model/Table/AddressesTable.php
index 808dae0..4768354 100644
--- a/src/Model/Table/AddressesTable.php
+++ b/src/Model/Table/AddressesTable.php
@@ -175,11 +175,11 @@ class AddressesTable extends Table {
      * @return void
      */
 	public function beforeMarshal(EventInterface $event, ArrayObject $data, ArrayObject $options): void {
-		if ($data['state_id'] && !isset($data['state'])) {
+		if (($data['state_id'] ?? false) && !isset($data['state'])) {
 			$state = $this->States->find()->where(['id' => $data['state_id']])->first();
 			$data['state'] = $state->name ?? null;
 		}
-		if ($data['country_id'] && !isset($data['country'])) {
+		if (($data['country_id'] ?? false) && !isset($data['country'])) {
 			$country = $this->Countries->find()->where(['id' => $data['country_id']])->first();
 			$data['country'] = $country->name ?? null;
 		}