diff --git a/gajim/gtk/conversation/view.py b/gajim/gtk/conversation/view.py
index 0aa4dda..45c8325 100644
--- a/gajim/gtk/conversation/view.py
+++ b/gajim/gtk/conversation/view.py
@@ -516,6 +516,9 @@ class ConversationView(Gtk.ScrolledWindow):
         self._insert_message(command_output_row)
 
     def add_message_from_db(self, message: Message) -> None:
+        if message.moderation is not None:
+           return
+
         message_row = MessageRow.from_db_row(self.contact, message)
         message_row.connect(
             'state-flags-changed', self._on_message_row_state_flags_changed)
@@ -826,7 +829,7 @@ class ConversationView(Gtk.ScrolledWindow):
     def show_message_moderation(self, stanza_id: str, text: str) -> None:
         message_row = self._get_row_by_stanza_id(stanza_id)
         if message_row is not None:
-            message_row.set_moderated(text)
+            message_row.destroy()
 
     def update_message_reactions(self, reaction_id: str) -> None:
         if isinstance(self._contact, GroupchatContact):