diff --git a/rhodecode/model/notification.py b/rhodecode/model/notification.py
--- a/rhodecode/model/notification.py
+++ b/rhodecode/model/notification.py
@@ -117,14 +117,16 @@ class NotificationModel(BaseModel):
         # add mentioned users into recipients
         final_recipients = set(recipients_objs).union(mention_recipients)
 
-        (subject, email_body, email_body_plaintext) = \
-            EmailNotificationModel().render_email(notification_type, **email_kwargs)
+        # No need to render email if we are sending just notification
+        if with_email:
+            (subject, email_body, email_body_plaintext) = \
+                EmailNotificationModel().render_email(notification_type, **email_kwargs)
 
-        if not notification_subject:
-            notification_subject = subject
+            if not notification_subject:
+                notification_subject = subject
 
-        if not notification_body:
-            notification_body = email_body_plaintext
+            if not notification_body:
+                notification_body = email_body_plaintext
 
         notification = Notification.create(
             created_by=created_by_obj, subject=notification_subject,