diff --git a/app/Ninja/Mailers/Mailer.php b/app/Ninja/Mailers/Mailer.php
index c8a29f30ab32..5b4d34c23302 100644
--- a/app/Ninja/Mailers/Mailer.php
+++ b/app/Ninja/Mailers/Mailer.php
@@ -119,8 +119,11 @@ class Mailer
                 $error = trans('texts.postmark_error', ['link' => link_to('https://status.postmarkapp.com/')]);
                 Utils::logError($error);
 
-                // TODO throw the exception once all emails are sent using the queue
-                return $error;
+                if (config('queue.default') === 'sync') {
+                    return $error;
+                } else {
+                    throw $exception;
+                }
             }
 
             $response = $response->getBody()->getContents();