diff --git a/src/console/controllers/UpgradeController.php b/src/console/controllers/UpgradeController.php
index bd32424276..4f1f7bbdc9 100644
--- a/src/console/controllers/UpgradeController.php
+++ b/src/console/controllers/UpgradeController.php
@@ -966,9 +966,13 @@ private function _createAddress($data): Address
         $address->locality = $data['city'];
         $address->dependentLocality = '';
 
-        if ($data['firstName'] || $data['lastName']) {
+        if ($data['fullName'] || $data['firstName'] || $data['lastName']) {
             $this->_ensureAddressField(new FullNameField());
-            $address->fullName = implode(' ', array_filter([$data['firstName'], $data['lastName']]));
+            if ($data['fullName']) {
+                $address->fullName = $data['fullName'];
+            } else {
+                $address->fullName = implode(' ', array_filter([$data['firstName'], $data['lastName']]));
+            }
         }
 
         if ($data['businessName']) {