diff --git a/payroll/models/tax_models.py b/payroll/models/tax_models.py
index 034de1aa7..d423ce182 100644
--- a/payroll/models/tax_models.py
+++ b/payroll/models/tax_models.py
@@ -11,6 +11,7 @@ from django.db import models
 from django.utils.text import format_lazy
 from django.utils.translation import gettext_lazy as _
 
+from base.horilla_company_manager import HorillaCompanyManager
 from base.models import Company
 from horilla.models import HorillaModel
 from payroll.models.models import FilingStatus
@@ -31,20 +32,12 @@ class PayrollSettings(HorillaModel):
         max_length=15, null=True, choices=choices, default="postfix"
     )
 
-    company_id = models.ForeignKey(
-        Company, null=True, editable=False, on_delete=models.PROTECT
-    )
-    objects = models.Manager()
+    company_id = models.ForeignKey(Company, null=True, on_delete=models.PROTECT)
+    objects = HorillaCompanyManager("company_id")
 
     def __str__(self):
         return f"Payroll Settings {self.currency_symbol}"
 
-    def save(self, *args, **kwargs):
-        if 1 < PayrollSettings.objects.count():
-            raise ValidationError("You cannot add more conditions.")
-
-        return super().save(*args, **kwargs)
-
 
 class TaxBracket(HorillaModel):
     """
diff --git a/payroll/templates/payroll/settings/payroll_settings.html b/payroll/templates/payroll/settings/payroll_settings.html
index 8a3d1a3df..ae0e9a776 100644
--- a/payroll/templates/payroll/settings/payroll_settings.html
+++ b/payroll/templates/payroll/settings/payroll_settings.html
@@ -44,6 +44,20 @@
           <span class="select2-selection--multiple w-25" >{{ currency_form.position }}</span>
         </div>
       </div>
+      <div class="col-sm-12 col-md-12 col-lg-3">
+        <div class="oh-input-group">
+          <div class="oh-label__info" for="company_id">
+            <label class="oh-label" for="company_id">{% trans "Company" %}</label>
+          </div>
+          <select name="company_id" id="id_company_id" class="oh-select oh-select-2 w-100">
+            {% for company in companies %}
+                <option value="{{ company.id }}" {% if company.id == selected_company_id %}selected{% endif %}>
+                    {{ company.company }}
+                </option>
+            {% endfor %}
+        </select>
+        </div>
+      </div>
       {% if perms.payroll.change_payrollsettings %}
         <div  class="d-flex align-items-end col-sm-12 col-md-12 col-lg-3">
           <button type="submit" class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp">{% trans 'Save Changes' %}</button>
diff --git a/payroll/views/views.py b/payroll/views/views.py
index ee6f9c0fc..4d762641a 100644
--- a/payroll/views/views.py
+++ b/payroll/views/views.py
@@ -423,6 +423,13 @@ def settings(request):
     """
     instance = PayrollSettings.objects.first()
     currency_form = PayrollSettingsForm(instance=instance)
+    selected_company_id = request.session.get("selected_company")
+
+    if selected_company_id == "all" or not selected_company_id:
+        companies = Company.objects.all()
+    else:
+        companies = Company.objects.filter(id=selected_company_id)
+
     if request.method == "POST":
 
         currency_form = PayrollSettingsForm(request.POST, instance=instance)
@@ -430,8 +437,16 @@ def settings(request):
 
             currency_form.save()
             messages.success(request, _("Payroll settings updated."))
-    # return render(request, "payroll/settings/payroll_settings.html", {"currency_form": currency_form})
-    return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/"))
+            return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/"))
+    return render(
+        request,
+        "payroll/settings/payroll_settings.html",
+        {
+            "currency_form": currency_form,
+            "companies": companies,
+            "selected_company_id": selected_company_id,
+        },
+    )
 
 
 @login_required