diff --git a/app/Http/Controllers/Wizard/Companies.php b/app/Http/Controllers/Wizard/Companies.php
index 05fd496a9..f94d545a1 100644
--- a/app/Http/Controllers/Wizard/Companies.php
+++ b/app/Http/Controllers/Wizard/Companies.php
@@ -97,10 +97,6 @@ class Companies extends Controller
             }
 
             setting()->set($real_key, $value);
-
-            if ($key == 'country') {
-                setting()->set('default.' . $key, $value);
-            }
         }
 
         // Save all settings
diff --git a/app/Jobs/Common/CreateCompany.php b/app/Jobs/Common/CreateCompany.php
index 18d64775f..17807df7c 100644
--- a/app/Jobs/Common/CreateCompany.php
+++ b/app/Jobs/Common/CreateCompany.php
@@ -89,7 +89,6 @@ class CreateCompany extends Job implements HasOwner, HasSource, ShouldCreate
             'company.country' => $this->request->get('country'),
             'default.currency' => $this->request->get('currency'),
             'default.locale' => $this->request->get('locale', 'en-GB'),
-            'default.country' => $this->request->get('country'),
         ]);
 
         if (!empty($this->request->settings)) {
diff --git a/resources/views/modals/customers/create.blade.php b/resources/views/modals/customers/create.blade.php
index 7599a812c..9bc2977d7 100644
--- a/resources/views/modals/customers/create.blade.php
+++ b/resources/views/modals/customers/create.blade.php
@@ -18,7 +18,7 @@
 
         {{ Form::textareaGroup('address', trans('general.address')) }}
 
-        {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
+        {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}
 
         {{ Form::hidden('type', 'customer') }}
         {!! Form::hidden('enabled', '1', []) !!}
diff --git a/resources/views/modals/vendors/create.blade.php b/resources/views/modals/vendors/create.blade.php
index e5de81f10..444d55400 100644
--- a/resources/views/modals/vendors/create.blade.php
+++ b/resources/views/modals/vendors/create.blade.php
@@ -18,7 +18,7 @@
 
         {{ Form::textareaGroup('address', trans('general.address')) }}
 
-        {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
+        {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}
 
         {{ Form::hidden('type', 'vendor') }}
         {!! Form::hidden('enabled', '1', []) !!}
diff --git a/resources/views/purchases/vendors/create.blade.php b/resources/views/purchases/vendors/create.blade.php
index 3f6d1148e..060554682 100644
--- a/resources/views/purchases/vendors/create.blade.php
+++ b/resources/views/purchases/vendors/create.blade.php
@@ -37,7 +37,7 @@
 
                     {{ Form::textGroup('state', trans('general.state'), 'city', []) }}
 
-                    {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
+                    {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}
 
                     {{ Form::fileGroup('logo', trans_choice('general.pictures', 1), '', ['dropzone-class' => 'form-file']) }}
 
diff --git a/resources/views/sales/customers/create.blade.php b/resources/views/sales/customers/create.blade.php
index 67ef63b07..c81bb236b 100644
--- a/resources/views/sales/customers/create.blade.php
+++ b/resources/views/sales/customers/create.blade.php
@@ -38,7 +38,7 @@
 
                 {{ Form::textGroup('state', trans('general.state'), 'city', []) }}
 
-                {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
+                {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }}
 
                 {{ Form::textGroup('reference', trans('general.reference'), 'file', []) }}
 
diff --git a/resources/views/settings/default/edit.blade.php b/resources/views/settings/default/edit.blade.php
index 8fe845fed..9351c3c5c 100644
--- a/resources/views/settings/default/edit.blade.php
+++ b/resources/views/settings/default/edit.blade.php
@@ -32,8 +32,6 @@
 
                 {{ Form::selectGroup('locale', trans_choice('general.languages', 1), 'flag', language()->allowed(), setting('default.locale'), []) }}
 
-                {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('default.country'), []) }}
-
                 {{ Form::selectGroup('list_limit', trans('settings.default.list_limit'), 'columns', ['10' => '10', '25' => '25', '50' => '50', '100' => '100'], setting('default.list_limit'), []) }}
 
                 {{ Form::radioGroup('use_gravatar', trans('settings.default.use_gravatar'), setting('default.use_gravatar')) }}