diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 19bdc0e890..17ee43a6c8 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -283,7 +283,7 @@ class BaseController extends Controller
         if (request()->has('first_load') && request()->input('first_load') == 'true') 
         {
 
-          if (auth()->user()->getCompany()->clients->count() > 1000) 
+          if (auth()->user()->getCompany()->invoices->count() > 1000) 
           {
 
             $data = $mini_load;
diff --git a/app/Utils/Traits/MakesInvoiceValues.php b/app/Utils/Traits/MakesInvoiceValues.php
index 7d4e1b052d..6f315c691b 100644
--- a/app/Utils/Traits/MakesInvoiceValues.php
+++ b/app/Utils/Traits/MakesInvoiceValues.php
@@ -150,7 +150,7 @@ trait MakesInvoiceValues
             $data['$'.$label . '_label'] = ctrans('texts.'.$label);
         }
 
-        if(property_exists($custom_fields,'invoice_text1'))
+        if($custom_fields && property_exists($custom_fields,'invoice_text1'))
             $data['$invoice_text1'] = $custom_fields->invoice_text1;
 
         return $data;