diff --git a/ajax/invoices/addComment.php b/ajax/invoices/addComment.php
index 61ec5f37f21e9dc34559eff0fa1d938c20bff361..bf218a0ccfb5497842b348c2a43d667adb07e658 100644
--- a/ajax/invoices/addComment.php
+++ b/ajax/invoices/addComment.php
@@ -13,21 +13,11 @@
 QUI::$Ajax->registerFunction(
     'package_quiqqer_invoice_ajax_invoices_addComment',
     function ($invoiceId, $comment) {
-        $Invoices = QUI\ERP\Accounting\Invoice\Handler::getInstance();
-        $Invoice  = null;
-
         try {
-            $Invoice = $Invoices->getInvoice($invoiceId);
+            $Invoice = QUI\ERP\Accounting\Invoice\Utils\Invoice::getInvoiceByString($invoiceId);
         } catch (\Exception $Exception) {
             QUI\System\Log::addDebug($Exception->getMessage());
-        }
-
-        if ($Invoice === null) {
-            try {
-                $Invoice = $Invoices->getTemporaryInvoice($invoiceId);
-            } catch (\Exception $Exception) {
-                QUI\System\Log::addDebug($Exception->getMessage());
-            }
+            throw $Exception;
         }
 
         $Invoice->addComment($comment);