diff --git a/.drone.jsonnet b/.drone.jsonnet
index 46e816b..587c8fb 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -171,7 +171,7 @@ local PipelineNotifications = {
       settings: {
         homeserver: { from_secret: 'matrix_homeserver' },
         roomid: { from_secret: 'matrix_roomid' },
-        template: 'Status: **{{ build.Status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}) ({{ build.Branch }}) by {{ commit.Author }}<br/> Message: {{ commit.Message }}',
+        template: 'Status: **{{ build.Status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}){{#if build.Branch}} ({{ build.Branch }}){{/if}} by {{ commit.Author }}<br/> Message: {{ commit.Message.Title }}',
         username: { from_secret: 'matrix_username' },
         password: { from_secret: 'matrix_password' },
       },
diff --git a/.drone.yml b/.drone.yml
index c086f8f..51ff695 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -332,7 +332,7 @@ steps:
         from_secret: matrix_password
       roomid:
         from_secret: matrix_roomid
-      template: "Status: **{{ build.Status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}) ({{ build.Branch }}) by {{ commit.Author }}<br/> Message: {{ commit.Message }}"
+      template: "Status: **{{ build.Status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}){{#if build.Branch}} ({{ build.Branch }}){{/if}} by {{ commit.Author }}<br/> Message: {{ commit.Message.Title }}"
       username:
         from_secret: matrix_username
     when:
@@ -355,6 +355,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 3a17a1b2f7d0349e5b6d28d858edec39cfd0cdec42a3f8036b4a252ee2f786b2
+hmac: 58440189df0244438fb5e8111ede27f4fcf9f22b0d9d101fdeb5b4fc376f51fe
 
 ...