diff --git a/app/Models/Presenters/CompanyPresenter.php b/app/Models/Presenters/CompanyPresenter.php
index 779ed8187883..ed58bf40b35b 100644
--- a/app/Models/Presenters/CompanyPresenter.php
+++ b/app/Models/Presenters/CompanyPresenter.php
@@ -36,7 +36,7 @@ class CompanyPresenter extends EntityPresenter
             $settings = $this->entity->settings;
         }
 
-        return (strlen($settings->company_logo) > 0) ? $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png';
+        return (strlen($settings->company_logo) > 0) ? url($settings->company_logo) : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png';
     }
 
     public function address($settings = null)
diff --git a/app/Utils/Traits/Uploadable.php b/app/Utils/Traits/Uploadable.php
index 8b56467e7f66..44778073104f 100644
--- a/app/Utils/Traits/Uploadable.php
+++ b/app/Utils/Traits/Uploadable.php
@@ -22,14 +22,9 @@ trait Uploadable
 {
     public function removeLogo($company)
     {
-        $company_logo = $company->settings->company_logo;
 
-        $file_name = basename($company_logo);
-
-        $storage_path = $company->company_key . '/' . $file_name;
-
-        if (Storage::exists($storage_path)) {
-            UnlinkFile::dispatchNow(config('filesystems.default'), $storage_path);
+        if (Storage::exists($company->settings->company_logo)) {
+            UnlinkFile::dispatchNow(config('filesystems.default'), $company->settings->company_logo);
         }
     }
 
@@ -38,6 +33,8 @@ trait Uploadable
         if ($file) {
             $path = UploadAvatar::dispatchNow($file, $company->company_key);
 
+            $path = str_replace(config("ninja.app_url"), "", $path);
+
             info("the path {$path}");
 
             if ($path) {