diff --git a/notifications/notification.py b/notifications/notification.py
index 0acb22836..ac05decbc 100644
--- a/notifications/notification.py
+++ b/notifications/notification.py
@@ -42,12 +42,12 @@ def run(self):
             server.quit()
             logger.info("E-mails were sent successfully.")
         except Exception as exc:
-            logger.error("Could not send emails with Python smtlib, exception: {} -- {}".format(type(exc).__name__, exc.args))
+            logger.error("Could not send emails with Python smtlib", exc_info=True)
             ex = ""
             try:
                 ex = str(exc.args)
             except Exception as exctwo:
-                logger.error(exctwo.args)
+                logger.warning(exctwo.args)
             cron_rec = {
                 "name": "notification",
                 "message": "Error sending out email with Python smtplib: {}".format(ex),
@@ -92,6 +92,9 @@ def send_notification(subject, recipients, html, mailtype="", files=None):
         SendMail(recipients, msg).start()
         return
 
+    if "?" not in settings.EMAIL_API_ENDPOINT:  # a.k.a dirty disabling email sending
+        return
+
     to_addresses = recipients if isinstance(recipients, list) else [recipients]
 
     #    if not IS_PROD:
@@ -152,15 +155,15 @@ def send_notification(subject, recipients, html, mailtype="", files=None):
         )
 
         logger.info("E-mails were sent successfully.")
-    elif res.status_code == 401 or res.status_code == 403:
-        # Try sending with Python smtplib, if reaching the API fails
-        logger.error(f"Authorization/authentication failed ({res.status_code}) to the e-mail sender API.")
-        msg = construct_msg(subject, html)
-        SendMail(to_addresses, msg).start()
     else:
+        logger.error(
+            f"Email send failed using API, status code: ({res.status_code})",
+            extra={
+                "content": res.content,
+            },
+        )
         # Try sending with Python smtplib, if reaching the API fails
-        logger.error("Could not reach the e-mail sender API. Trying with Python smtplib...")
+        logger.warning(f"Authorization/authentication failed ({res.status_code}) to the e-mail sender API.")
         msg = construct_msg(subject, html)
         SendMail(to_addresses, msg).start()
-
     return res.text