diff --git a/src/Dialogs/AliasDialog/Alias.vala b/src/Dialogs/AliasDialog/Alias.vala
index 97d296676..b3e268f7a 100644
--- a/src/Dialogs/AliasDialog/Alias.vala
+++ b/src/Dialogs/AliasDialog/Alias.vala
@@ -151,9 +151,7 @@ public class Mail.Alias : Gtk.ListBoxRow {
         notify["alias-name"].connect (update_name_label);
         update_name_label ();
 
-        save.connect (() => {
-            old_address = address;
-        });
+        save.connect (() => old_address = address);
 
         name_entry.activate.connect (edit_popover.popdown);
         address_entry.activate.connect (() => Idle.add (() => { // Without Idle this could cause activation of the '+ Add Alias' button
diff --git a/src/Dialogs/AliasDialog/AliasDialog.vala b/src/Dialogs/AliasDialog/AliasDialog.vala
index 4ce55b78c..2b538e298 100644
--- a/src/Dialogs/AliasDialog/AliasDialog.vala
+++ b/src/Dialogs/AliasDialog/AliasDialog.vala
@@ -200,8 +200,6 @@ public class Mail.AliasDialog : Hdy.ApplicationWindow {
             encoded_aliases.add (val ?? "", key);
         });
 
-        if (encoded_aliases.length () > 0) {
-            Backend.Session.get_default ().set_aliases_for_account_uid.begin (account_uid, encoded_aliases.encode ());
-        }
+        Backend.Session.get_default ().set_aliases_for_account_uid.begin (account_uid, encoded_aliases.encode () ?? "");
     }
 }