diff --git a/app/Models/Company.php b/app/Models/Company.php
index f17aaba1..71e4c631 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -22,10 +22,17 @@ class Company extends Model implements HasMedia
     public function getLogoAttribute()
     {
         $logo = $this->getMedia('logo')->first();
+
+        $isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
+
         if ($logo) {
-            return  asset($logo->getUrl());
+            if ($isSystem) {
+                return $logo->getPath();
+            } else  {
+                return $logo->getFullUrl();
+            }
         }
-        return ;
+        return null;
     }
 
     public function user()
diff --git a/app/Models/Estimate.php b/app/Models/Estimate.php
index a3fa3132..bf1baf7c 100644
--- a/app/Models/Estimate.php
+++ b/app/Models/Estimate.php
@@ -428,16 +428,7 @@ class Estimate extends Model implements HasMedia
         $estimateTemplate = EstimateTemplate::find($this->estimate_template_id);
 
         $company = Company::find($this->company_id);
-        $logo = $company->getMedia('logo')->first();
-
-        $isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
-        $isLocalhost = config('session.domain') === 'localhost';
-
-        if ($logo && $isLocalhost && $isSystem) {
-            $logo = $logo->getPath();
-        } else if ($logo) {
-            $logo = $logo->getFullUrl();
-        }
+        $logo = $company->logo;
 
         view()->share([
             'estimate' => $this,
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index f0d36616..db93a008 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -512,16 +512,7 @@ class Invoice extends Model implements HasMedia
 
         $company = Company::find($this->company_id);
 
-        $logo = $company->getMedia('logo')->first();
-
-        $isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
-        $isLocalhost = config('session.domain') === 'localhost';
-
-        if ($logo && $isLocalhost && $isSystem) {
-            $logo = $logo->getPath();
-        } else if ($logo) {
-            $logo = $logo->getFullUrl();
-        }
+        $logo = $company->logo;
 
         view()->share([
             'invoice' => $this,
diff --git a/app/Models/Payment.php b/app/Models/Payment.php
index 0845ea80..6ddbc9cd 100644
--- a/app/Models/Payment.php
+++ b/app/Models/Payment.php
@@ -373,16 +373,7 @@ class Payment extends Model implements HasMedia
     {
         $company = Company::find($this->company_id);
 
-        $logo = $company->getMedia('logo')->first();
-
-        $isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
-        $isLocalhost = config('session.domain') === 'localhost';
-
-        if ($logo && $isLocalhost && $isSystem) {
-            $logo = $logo->getPath();
-        } else if($logo) {
-            $logo = $logo->getFullUrl();
-        }
+        $logo = $company->logo;
 
         view()->share([
             'payment' => $this,