diff --git a/app/Models/HR/PayrollSetting.php b/app/Models/HR/PayrollSetting.php
index f2871aa8..30dba1cc 100644
--- a/app/Models/HR/PayrollSetting.php
+++ b/app/Models/HR/PayrollSetting.php
@@ -62,7 +62,7 @@ class PayrollSetting extends Model
 
     public function scopeForTenant($query, ?int $tenantId = null)
     {
-        $tenantId = $tenantId ?? session('selected_tenant_id') ?? 1;
+        $tenantId = $tenantId ?? session('selected_tenant_id', 1);
 
         return $query->where('tenant_id', $tenantId);
     }
@@ -73,7 +73,7 @@ public function scopeForTenant($query, ?int $tenantId = null)
 
     public static function getOrCreate(?int $tenantId = null): self
     {
-        $tenantId = $tenantId ?? session('selected_tenant_id') ?? 1;
+        $tenantId = $tenantId ?? session('selected_tenant_id', 1);
 
         return self::firstOrCreate(
             ['tenant_id' => $tenantId],