diff --git a/app/Http/Requests/EInvoice/Peppol/AddTaxIdentifierRequest.php b/app/Http/Requests/EInvoice/Peppol/AddTaxIdentifierRequest.php
index 7f1347d2ca..dc55074144 100644
--- a/app/Http/Requests/EInvoice/Peppol/AddTaxIdentifierRequest.php
+++ b/app/Http/Requests/EInvoice/Peppol/AddTaxIdentifierRequest.php
@@ -15,6 +15,7 @@ namespace App\Http\Requests\EInvoice\Peppol;
 use App\Models\Country;
 use Illuminate\Validation\Rule;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Validator;
 
 class AddTaxIdentifierRequest extends FormRequest
 {
@@ -72,7 +73,11 @@ class AddTaxIdentifierRequest extends FormRequest
         $company = $user->company();
 
         return [
-            'country' => ['required', 'bail', Rule::in(array_keys(self::$vat_regex_patterns))],
+            'country' => ['required', 'bail', Rule::in(array_keys(self::$vat_regex_patterns)), function ($attribute, $value, $fail) use ($company) {
+                if ($this->country_id == $company->country()->id) {
+                    $fail(ctrans('texts.country_not_supported'));
+                }
+            }],
             'vat_number' => [
                'required',
                'string',