1 files changed, 6 insertions, 4 deletions

diff --git a/src/mailman/rules/moderation.py b/src/mailman/rules/moderation.py
index 9c89cf0b2..d3dc07a8f 100644
--- a/src/mailman/rules/moderation.py
+++ b/src/mailman/rules/moderation.py
@@ -44,8 +44,9 @@ class MemberModeration:
             member = mlist.members.get_member(sender)
             if member is None:
                 return False
-            action = (member.moderation_action
-                      or mlist.default_member_action)
+            action = (mlist.default_member_action
+                      if member.moderation_action is None
+                      else member.moderation_action)
             if action is Action.defer:
                 # The regular moderation rules apply.
                 return False
@@ -114,8 +115,9 @@ class NonmemberModeration:
                         _record_action(msgdata, action, sender,
                                        reason.format(action))
                         return True
-            action = (nonmember.moderation_action
-                      or mlist.default_nonmember_action)
+            action = (mlist.default_nonmember_action
+                      if nonmember.moderation_action is None
+                      else nonmember.moderation_action)
             if action is Action.defer:
                 # The regular moderation rules apply.
                 return False