diff --git a/ui-rs/src/settings/templates/TemplateForm.js b/ui-rs/src/settings/templates/TemplateForm.js
index 92779e0..527ddbe 100644
--- a/ui-rs/src/settings/templates/TemplateForm.js
+++ b/ui-rs/src/settings/templates/TemplateForm.js
@@ -234,11 +234,6 @@ const TemplateForm = ({ initialValues, onSubmit, onClose, title, submitLabelId,
     return errors;
   };
 
-  // Swapping patron for staff is an ordinary update; only clearing one is impossible,
-  // since PUT can set an audience but never restore the "matches both" null. So the
-  // choice is withheld rather than offered and then refused.
-  const audiences = editing && initialValues?.audience ? AUDIENCES.filter(Boolean) : AUDIENCES;
-
   // Whether the body currently holds markup, which is not the same question as
   // which content type is selected: switching to text leaves the markup alone.
   const bodyIsMarkup = useRef(initialValues?.contentType === 'html');
@@ -335,7 +330,7 @@ const TemplateForm = ({ initialValues, onSubmit, onClose, title, submitLabelId,
                     id="template-audience"
                     name="audience"
                     component={Select}
-                    dataOptions={opts('audience', audiences)}
+                    dataOptions={opts('audience', AUDIENCES)}
                     label={<FormattedMessage id="ui-rs.settings.templates.field.audience" />}
                   />
                 </Col>
diff --git a/ui-rs/src/settings/templates/TemplateForm.test.js b/ui-rs/src/settings/templates/TemplateForm.test.js
index fecc090..5b0a4f0 100644
--- a/ui-rs/src/settings/templates/TemplateForm.test.js
+++ b/ui-rs/src/settings/templates/TemplateForm.test.js
@@ -254,26 +254,13 @@ describe('TemplateForm', () => {
     expect(byId('template-purpose')).toBeDisabled();
   });
 
-  describe('audience', () => {
-    const optionValues = () => [...byId('template-audience').options].map(opt => opt.value);
-
-    it('cannot be cleared once set, which the broker cannot restore to "both"', () => {
-      renderForm(jest.fn(), {
-        editing: true,
-        initialValues: { ...baseInitial, title: 'T', body: 'B', subject: 'S', labels: ['l'], audience: 'patron' },
-      });
-
-      expect(optionValues()).toEqual(['patron', 'staff']);
+  it('offers "both" when editing a template that has an audience, which PUT can now restore', () => {
+    renderForm(jest.fn(), {
+      editing: true,
+      initialValues: { ...baseInitial, title: 'T', body: 'B', subject: 'S', labels: ['l'], audience: 'patron' },
     });
 
-    it('can still be narrowed from "both", which needs no restoring', () => {
-      renderForm(jest.fn(), {
-        editing: true,
-        initialValues: { ...baseInitial, title: 'T', body: 'B', subject: 'S', labels: ['l'] },
-      });
-
-      expect(optionValues()).toEqual(['', 'patron', 'staff']);
-    });
+    expect([...byId('template-audience').options].map(opt => opt.value)).toEqual(['', 'patron', 'staff']);
   });
 
   describe('labels', () => {
diff --git a/ui-rs/src/settings/templates/mapping.js b/ui-rs/src/settings/templates/mapping.js
index c0598d4..43fad2a 100644
--- a/ui-rs/src/settings/templates/mapping.js
+++ b/ui-rs/src/settings/templates/mapping.js
@@ -39,10 +39,10 @@ export function buildUpdateTemplateBody(values = {}) {
     body: values.body,
     contentType: values.contentType,
     labels: cleanLabels(values.labels),
-    subject: (values.subject ?? '').trim(),
   };
-  // Omitted rather than sent empty: "" matches neither an audience nor the IS NULL
-  // "both" case, making the template unreachable. The form rejects clearing it.
+  // Omitted optional fields are cleared by PUT.
+  const subject = (values.subject ?? '').trim();
+  if (subject && values.purpose !== 'pullslip') updated.subject = subject;
   if (values.audience) updated.audience = values.audience;
   return updated;
 }
diff --git a/ui-rs/src/settings/templates/mapping.test.js b/ui-rs/src/settings/templates/mapping.test.js
index df69f2e..f6f31dd 100644
--- a/ui-rs/src/settings/templates/mapping.test.js
+++ b/ui-rs/src/settings/templates/mapping.test.js
@@ -83,13 +83,14 @@ describe('buildUpdateTemplateBody', () => {
     expect(buildUpdateTemplateBody(values)).not.toHaveProperty('purpose');
   });
 
-  it('sends an empty subject so clearing one takes effect', () => {
-    // PUT leaves omitted fields untouched, so omission would silently keep the old value.
-    expect(buildUpdateTemplateBody({ ...values, subject: '' }).subject).toBe('');
+  it('omits blank optional fields', () => {
+    const body = buildUpdateTemplateBody({ ...values, subject: '   ', audience: '' });
+    expect(body).not.toHaveProperty('subject');
+    expect(body).not.toHaveProperty('audience');
   });
 
-  it('omits a cleared audience, which would otherwise be stored as an unmatchable empty string', () => {
-    expect(buildUpdateTemplateBody({ ...values, audience: '' })).not.toHaveProperty('audience');
+  it('omits the subject for pull slips, clearing one that was stored', () => {
+    expect(buildUpdateTemplateBody({ ...values, purpose: 'pullslip' })).not.toHaveProperty('subject');
   });
 });