diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
index cd18672eb1bb..ca04fe5a3d0a 100644
--- a/app/Http/Controllers/ClientController.php
+++ b/app/Http/Controllers/ClientController.php
@@ -379,6 +379,15 @@ class ClientController extends BaseController
 
         $client->load('contacts', 'primary_contact');
 
+        /* Set the client country to the company if none is set */
+        if(!$client->country_id && strlen($client->company->settings->country_id) > 1){
+
+            $client->country_id = $client->company->settings->country_id;
+        
+            $client->save();
+        
+        }
+
         $this->uploadLogo($request->file('company_logo'), $client->company, $client);
 
         event(new ClientWasCreated($client, $client->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
diff --git a/app/Repositories/ClientRepository.php b/app/Repositories/ClientRepository.php
index 4fc82a56dc4e..00bab25de267 100644
--- a/app/Repositories/ClientRepository.php
+++ b/app/Repositories/ClientRepository.php
@@ -67,7 +67,7 @@ class ClientRepository extends BaseRepository
         if (empty($data['name'])) {
             $data['name'] = $client->present()->name();
         }
-        
+
         $client->save();
 
         $this->contact_repo->save($data, $client);