diff --git a/stdlib/stdlib.go b/stdlib/stdlib.go
index 0b1d758..57b784d 100644
--- a/stdlib/stdlib.go
+++ b/stdlib/stdlib.go
@@ -150,7 +150,9 @@ func templates(api *confluence.API) (*template.Template, error) {
 		`ac:jira:ticket`: text(
 			`<ac:structured-macro ac:name="jira">`,
 			`<ac:parameter ac:name="key">{{ .Ticket }}</ac:parameter>`,
-			`<ac:parameter ac:name="server">{{ or .Server "System JIRA" }}</ac:parameter>`,
+			`{{ if .Server }}`,
+				`<ac:parameter ac:name="server">{{ .Server }}</ac:parameter>`,
+			`{{ end }}`,
 			`</ac:structured-macro>`,
 		),