diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php
index 0cef604af24b..707716c7fcc0 100644
--- a/app/Models/BaseModel.php
+++ b/app/Models/BaseModel.php
@@ -6,11 +6,13 @@ use App\Filters\QueryFilters;
 use App\Utils\Traits\UserSessionAttributes;
 use Hashids\Hashids;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Log;
 
 class BaseModel extends Model
 {
     use UserSessionAttributes;
+    use SoftDeletes;
 
     public function __call($method, $params)
     {
@@ -29,6 +31,12 @@ class BaseModel extends Model
         return parent::__call($method, $params);
     }
 
+    public function scopeCompany($query, $company_id)
+    {
+        $query->where('company_id', $company_id);
+        return $query;
+    }
+
     public function scopeScope($query)
     {
 
diff --git a/app/Models/CompanyToken.php b/app/Models/CompanyToken.php
index fa75f73dcbf5..898b23aaab37 100644
--- a/app/Models/CompanyToken.php
+++ b/app/Models/CompanyToken.php
@@ -4,7 +4,7 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
-class CompanyToken extends BaseModel
+class CompanyToken extends Model
 {
     /**
      * @var bool
diff --git a/app/Models/Country.php b/app/Models/Country.php
index 96f861063236..9feacf4260c4 100644
--- a/app/Models/Country.php
+++ b/app/Models/Country.php
@@ -4,7 +4,7 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Country extends BaseModel
+class Country extends Model
 {
     public $timestamps = false;
 
diff --git a/app/Models/Timezone.php b/app/Models/Timezone.php
index bb0788bcb2a6..9341f21e03c9 100644
--- a/app/Models/Timezone.php
+++ b/app/Models/Timezone.php
@@ -4,7 +4,7 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Timezone extends BaseModel
+class Timezone extends Model
 {
     /**
      * @var bool
diff --git a/app/Utils/Traits/GeneratesNumberCounter.php b/app/Utils/Traits/GeneratesNumberCounter.php
index e01af07611b0..89a26cd93083 100644
--- a/app/Utils/Traits/GeneratesNumberCounter.php
+++ b/app/Utils/Traits/GeneratesNumberCounter.php
@@ -40,13 +40,13 @@ trait GeneratesNumberCounter
             }
 
             if ($entity == Client::class) {
-                $check = Client::whereIdNumber($number)->withTrashed()->first();
+                $check = Client::company($this->company_id)->whereIdNumber($number)->withTrashed()->first();
             } elseif ($entity == Invoice::class) {
-                $check = Invoice::whereInvoiceNumber($number)->withTrashed()->first();
+                $check = Invoice::company($this->company_id)->whereInvoiceNumber($number)->withTrashed()->first();
             } elseif ($entity == Quote::class) {
-            	$check = Quote::whereQuoteNumber($number)->withTrashed()->first();
+            	$check = Quote::company($this->company_id)->whereQuoteNumber($number)->withTrashed()->first();
             } elseif ($entity == Credit::class) {
-         		$check = Credit::whereCreditNumber($number)->withTrashed()->first();
+         		$check = Credit::company($this->company_id)->whereCreditNumber($number)->withTrashed()->first();
             }
 
             $counter++;