diff --git a/database/migrations/2020_12_02_090527_update_crater_version_400.php b/database/migrations/2020_12_02_090527_update_crater_version_400.php
index 5ffdb16a..1cba2880 100644
--- a/database/migrations/2020_12_02_090527_update_crater_version_400.php
+++ b/database/migrations/2020_12_02_090527_update_crater_version_400.php
@@ -1,5 +1,6 @@
 <?php
 
+use Crater\Models\Address;
 use Crater\Models\CompanySetting;
 use Crater\Models\Estimate;
 use Crater\Models\Expense;
@@ -35,14 +36,10 @@ class UpdateCraterVersion400 extends Migration
             // Update language
             $user->setSettings(['language' => CompanySetting::getSetting('language', $user->company_id)]);
 
-            // Update user's addresses
-            if ($user->addresses()->exists()) {
-                foreach ($user->addresses as $address) {
-                    $address->company_id = $user->company_id;
-                    $address->user_id = null;
-                    $address->save();
-                }
-            }
+            Address::where('user_id', $user->id)->update([
+                'company_id' => $user->company_id,
+                'user_id' => null
+            ]);
 
             // Update company settings
             $this->updateCompanySettings($user);
@@ -131,6 +128,6 @@ class UpdateCraterVersion400 extends Migration
             'payment_from_customer_address_format' => $paymentFromCustomerAddress,
         ];
 
-        CompanySetting::setSettings($settings, $user->companies()->first()->id);
+        CompanySetting::setSettings($settings, $user->company_id);
     }
 }