diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php
index 66ddedb03e84..5c8fd38e4803 100644
--- a/app/Http/Controllers/PreviewController.php
+++ b/app/Http/Controllers/PreviewController.php
@@ -164,15 +164,15 @@ class PreviewController extends BaseController
 
             $entity = ucfirst(request()->input('entity'));
 
-            $class = "App\Models\\$entity";
+            // $class = "App\Models\\$entity";
 
-            $entity_obj = $class::whereId($this->decodePrimaryKey(request()->input('entity_id')))->company()->first();
+            // $entity_obj = $class::whereId($this->decodePrimaryKey(request()->input('entity_id')))->company()->first();
 
-            if (! $entity_obj) {
+          //  if (! $entity_obj) {
 
             $entity_obj = $repo->save(request()->all(), $factory);
 
-            }
+           // }
 
             $entity_obj->load('client');
 
diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php
index 51ba726ee75b..6e9906037166 100644
--- a/app/Repositories/BaseRepository.php
+++ b/app/Repositories/BaseRepository.php
@@ -300,7 +300,7 @@ class BaseRepository
             $model->partial = min($model->amount, $model->balance);
 
         /* Update product details if necessary */
-        if ($model->company->update_products) 
+        if ($model->company->update_products && $model->id) 
             UpdateOrCreateProduct::dispatch($model->line_items, $model, $model->company);
 
         /* Perform model specific tasks */