diff --git a/app/Repositories/ClientRepository.php b/app/Repositories/ClientRepository.php
index d457eeefcd32..f7ec59ce7fba 100644
--- a/app/Repositories/ClientRepository.php
+++ b/app/Repositories/ClientRepository.php
@@ -70,7 +70,7 @@ class ClientRepository extends BaseRepository
             $client->settings = $client->saveSettings($data['settings'], $client);
         }
 
-        if (! $client->country_id) {
+        if (! $client->country_id || $client->country_id == 0) {
             /** @var \App\Models\Company $company **/
             $company = Company::find($client->company_id);
             $client->country_id = $company->settings->country_id;