diff --git a/app/Jobs/Product/UpdateOrCreateProduct.php b/app/Jobs/Product/UpdateOrCreateProduct.php
index 7f45f30c532d..8fc2cd654fd6 100644
--- a/app/Jobs/Product/UpdateOrCreateProduct.php
+++ b/app/Jobs/Product/UpdateOrCreateProduct.php
@@ -18,7 +18,6 @@ use App\Models\Product;
 use App\Repositories\InvoiceRepository;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Database\Capsule\Eloquent;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
@@ -27,11 +26,11 @@ class UpdateOrCreateProduct implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    private $products;
+    public $products;
 
-    private $invoice;
+    public $invoice;
 
-    private $company;
+    public $company;
 
     /**
      * Create a new job instance.
@@ -59,7 +58,14 @@ class UpdateOrCreateProduct implements ShouldQueue
     {
         MultiDB::setDB($this->company->db);
 
-        foreach ($this->products as $item) {
+        //only update / create products - not tasks or gateway fees
+        $updateable_products = collect($this->products)->filter(function ($item) {
+
+            return $item->type_id == 1;
+          
+        });
+
+        foreach ($updateable_products as $item) {
             if (empty($item->product_key)) {
                 continue;
             }
diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php
index 54ec44405f52..381bc754dffa 100644
--- a/app/Repositories/BaseRepository.php
+++ b/app/Repositories/BaseRepository.php
@@ -270,7 +270,7 @@ class BaseRepository
         $model = $model->service()->applyNumber()->save();
 
         if ($model->company->update_products !== false) {
-            UpdateOrCreateProduct::dispatch($model->line_items, $model, $model->company);
+            UpdateOrCreateProduct::dispatchNow($model->line_items, $model, $model->company);
         }
 
         if ($class->name == Invoice::class) {