diff --git a/app/Http/Controllers/Finance/JournalEntryController.php b/app/Http/Controllers/Finance/JournalEntryController.php
index b528906d..c8cb9d2c 100644
--- a/app/Http/Controllers/Finance/JournalEntryController.php
+++ b/app/Http/Controllers/Finance/JournalEntryController.php
@@ -831,7 +831,7 @@ public function accountCodeStore(Request $request): JsonResponse
         $maxSort = AccountCode::max('sort_order') ?? 0;
 
         $accountCode = AccountCode::create([
-            'tenant_id' => 1,
+            'tenant_id' => session('selected_tenant_id', 1),
             'code' => $validated['code'],
             'name' => $validated['name'],
             'category' => $validated['category'] ?? null,
diff --git a/app/Models/Barobill/AccountCode.php b/app/Models/Barobill/AccountCode.php
index 47cb6843..8caf5cff 100644
--- a/app/Models/Barobill/AccountCode.php
+++ b/app/Models/Barobill/AccountCode.php
@@ -3,6 +3,7 @@
 namespace App\Models\Barobill;
 
 use App\Models\Tenants\Tenant;
+use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
@@ -11,6 +12,7 @@
  */
 class AccountCode extends Model
 {
+    use BelongsToTenant;
     protected $table = 'account_codes';
 
     protected $fillable = [