diff --git a/lib/features/manage_account/domain/model/edit_email_rule_filter_request.dart b/lib/features/manage_account/domain/model/edit_email_rule_filter_request.dart
index 00625e76f..bd0191b89 100644
--- a/lib/features/manage_account/domain/model/edit_email_rule_filter_request.dart
+++ b/lib/features/manage_account/domain/model/edit_email_rule_filter_request.dart
@@ -15,9 +15,16 @@ class EditEmailRuleFilterRequest with EquatableMixin {
         .map((rule) {
             if (rule.id == tMailRuleChanged.id) {
               return tMailRuleChanged;
-            } else {
-              return rule;
+            } 
+            if (rule.conditionGroup != null) {
+              return TMailRule(
+                id: rule.id,
+                name: rule.name,
+                action: rule.action,
+                conditionGroup: rule.conditionGroup,
+              );
             }
+            return rule;
           })
         .toList();