diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb
index 9d52a1423b7..ce4a2a96015 100644
--- a/app/models/project_services/hipchat_service.rb
+++ b/app/models/project_services/hipchat_service.rb
@@ -125,12 +125,16 @@ class HipchatService < Service
     message
   end
 
-  def markdown(text, context = {})
+  def markdown(text, options = {})
     if text
-      context = ({
+      context = {
         project: project,
         pipeline: :email
-      }).merge(context)
+      }
+
+      Banzai.render(text, context)
+
+      context.merge!(options)
 
       html = Banzai.render(text, context)
       html = Banzai.post_process(html, context)