diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index e51526d9e414..36b40ede1d6d 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -2,6 +2,10 @@
 
 namespace App\Models;
 
+use App\Events\InvoiceWasCreated;
+use App\Events\InvoiceWasUpdated;
+use App\Events\QuoteWasCreated;
+use App\Events\QuoteWasUpdated;
 use App\Events\InvoiceInvitationWasEmailed;
 use App\Events\QuoteInvitationWasEmailed;
 use App\Libraries\CurlUtils;
@@ -1525,3 +1529,19 @@ Invoice::creating(function ($invoice) {
         $invoice->account->incrementCounter($invoice);
     }
 });
+
+Invoice::created(function ($invoice) {
+    if ($invoice->isType(INVOICE_TYPE_QUOTE)) {
+        event(new QuoteWasCreated($invoice));
+    } else {
+        event(new InvoiceWasCreated($invoice));
+    }
+});
+
+Invoice::updating(function ($invoice) {
+    if ($invoice->isType(INVOICE_TYPE_QUOTE)) {
+        event(new QuoteWasUpdated($invoice));
+    } else {
+        event(new InvoiceWasUpdated($invoice));
+    }
+});
diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index 31fd76a585a1..8b2aea10b99c 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -697,7 +697,7 @@ class InvoiceRepository extends BaseRepository
             $invoice = $this->saveInvitations($invoice);
         }
 
-        $this->dispachEvents($invoice);
+        //$this->dispachEvents($invoice);
 
         return $invoice;
     }