diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php
index 53c8194cff2a..916d8dbc8ff7 100644
--- a/app/Http/Controllers/PreviewController.php
+++ b/app/Http/Controllers/PreviewController.php
@@ -11,33 +11,35 @@
 
 namespace App\Http\Controllers;
 
+use App\Utils\Ninja;
+use App\Models\Client;
+use App\Models\Invoice;
+use App\Utils\HtmlEngine;
+use Illuminate\Support\Str;
+use Twig\Error\SyntaxError;
+use App\Jobs\Util\PreviewPdf;
+use App\Models\ClientContact;
+use App\Services\Pdf\PdfMock;
+use App\Utils\Traits\MakesHash;
+use App\Services\Pdf\PdfService;
+use App\Utils\PhantomJS\Phantom;
+use App\Models\InvoiceInvitation;
+use App\Services\PdfMaker\Design;
+use App\Utils\HostedPDF\NinjaPdf;
+use Illuminate\Support\Facades\DB;
+use App\Services\PdfMaker\PdfMaker;
+use Illuminate\Support\Facades\App;
+use App\Utils\Traits\GeneratesCounter;
+use App\Utils\Traits\MakesInvoiceHtml;
+use Turbo124\Beacon\Facades\LightLogs;
+use App\Utils\Traits\Pdf\PageNumbering;
+use Illuminate\Support\Facades\Response;
 use App\DataMapper\Analytics\LivePreview;
+use App\Services\Template\TemplateService;
+use App\Http\Requests\Preview\ShowPreviewRequest;
 use App\Http\Requests\Preview\DesignPreviewRequest;
 use App\Http\Requests\Preview\PreviewInvoiceRequest;
-use App\Http\Requests\Preview\ShowPreviewRequest;
-use App\Jobs\Util\PreviewPdf;
-use App\Models\Client;
-use App\Models\ClientContact;
-use App\Models\Invoice;
-use App\Models\InvoiceInvitation;
-use App\Services\Pdf\PdfMock;
-use App\Services\Pdf\PdfService;
-use App\Services\PdfMaker\Design;
-use App\Services\PdfMaker\PdfMaker;
-use App\Services\Template\TemplateService;
-use App\Utils\HostedPDF\NinjaPdf;
-use App\Utils\HtmlEngine;
-use App\Utils\Ninja;
-use App\Utils\PhantomJS\Phantom;
-use App\Utils\Traits\GeneratesCounter;
-use App\Utils\Traits\MakesHash;
-use App\Utils\Traits\MakesInvoiceHtml;
-use App\Utils\Traits\Pdf\PageNumbering;
-use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Response;
-use Turbo124\Beacon\Facades\LightLogs;
-use Twig\Error\SyntaxError;
+use App\Utils\VendorHtmlEngine;
 
 class PreviewController extends BaseController
 {
@@ -153,7 +155,8 @@ class PreviewController extends BaseController
                 return response()->json(['message' => ctrans('texts.invalid_design_object')], 400);
             }
 
-            $entity = ucfirst(request()->input('entity'));
+            // $entity = ucfirst(request()->input('entity'));
+            $entity = Str::camel(request()->input('entity'));
 
             $class = "App\Models\\$entity";
 
@@ -170,7 +173,12 @@ class PreviewController extends BaseController
             App::setLocale($entity_obj->client->preferredLocale());
             $t->replace(Ninja::transformTranslations($entity_obj->client->getMergedSettings()));
 
-            $html = new HtmlEngine($entity_obj->invitations()->first());
+            if($entity_obj->client){
+                $html = new HtmlEngine($entity_obj->invitations()->first());
+            }
+            else {
+                $html = new VendorHtmlEngine($entity_obj->invitations()->first());
+            }
 
             $design = new Design(Design::CUSTOM, ['custom_partials' => request()->design['design']]);