diff --git a/CHANGELOG.md b/CHANGELOG.md
index 714e45f3..e11a967c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 * Fix #503: set custom emojis max height to text height + bigger when posted alone
 * Fix: Converse bottom panel messages not visible on new Peertube v7 theme (for example for muted users)
 * Fix #75: New short video urls makes it difficult to use the settings «Activate chat for these videos».
+* Fix: moderation notes: fix filter button wrongly displayed on notes without associated occupant.
 
 ## 12.0.4
 
diff --git a/conversejs/custom/plugins/notes/components/muc-note-view.js b/conversejs/custom/plugins/notes/components/muc-note-view.js
index 260b31e3..3e80130e 100644
--- a/conversejs/custom/plugins/notes/components/muc-note-view.js
+++ b/conversejs/custom/plugins/notes/components/muc-note-view.js
@@ -14,7 +14,7 @@ export default class MUCNoteView extends CustomElement {
     return {
       model: { type: Object, attribute: true },
       edit: { type: Boolean, attribute: false },
-      is_ocupant_filter: { type: Boolean, attribute: true }
+      is_occupant_filter: { type: Boolean, attribute: true }
     }
   }
 
diff --git a/conversejs/custom/plugins/notes/templates/muc-note.js b/conversejs/custom/plugins/notes/templates/muc-note.js
index d900d442..3139055f 100644
--- a/conversejs/custom/plugins/notes/templates/muc-note.js
+++ b/conversejs/custom/plugins/notes/templates/muc-note.js
@@ -25,7 +25,7 @@ export function tplMucNote (el, note) {
               aboutOccupant
                 ? html`
                   <livechat-converse-muc-note-occupant
-                    .full_display=${el.is_ocupant_filter}
+                    .full_display=${el.is_occupant_filter}
                     .model=${aboutOccupant}
                     .note=${note}
                   ></livechat-converse-muc-note-occupant>`
@@ -34,7 +34,7 @@ export function tplMucNote (el, note) {
           <div class="note-description">${note.get('description') ?? ''}</div>
         </div>
         ${
-          aboutOccupant && el.is_ocupant_filter
+          !aboutOccupant || el.is_occupant_filter
             ? ''
             : html`
               <button type="button" class="note-action" @click=${ev => {
diff --git a/conversejs/custom/plugins/notes/templates/muc-notes.js b/conversejs/custom/plugins/notes/templates/muc-notes.js
index 0e31d255..ee50d3e3 100644
--- a/conversejs/custom/plugins/notes/templates/muc-notes.js
+++ b/conversejs/custom/plugins/notes/templates/muc-notes.js
@@ -77,7 +77,7 @@ export default function tplMucNotes (el, notes) {
           ? ''
           : html`<livechat-converse-muc-note
             .model=${note}
-            .is_ocupant_filter=${!!el.occupant_filter}
+            .is_occupant_filter=${!!el.occupant_filter}
           ></livechat-converse-muc-note>`
       })
     }`