diff --git a/account_ebics/wizards/ebics_xfer.py b/account_ebics/wizards/ebics_xfer.py
index cd0406b..08be0e3 100644
--- a/account_ebics/wizards/ebics_xfer.py
+++ b/account_ebics/wizards/ebics_xfer.py
@@ -115,7 +115,6 @@ class EbicsXfer(models.TransientModel):
     @api.onchange("ebics_config_id")
     def _onchange_ebics_config_id(self):
         ebics_userids = self.ebics_config_id.ebics_userid_ids
-        domain = {"ebics_userid_id": [("id", "in", ebics_userids.ids)]}
         ctx = self.env.context
         if ctx.get("ebics_download"):
             download_formats = self.ebics_config_id.ebics_file_format_ids.filtered(
@@ -140,11 +139,6 @@ class EbicsXfer(models.TransientModel):
                 )
                 if len(upload_formats) == 1:
                     self.format_id = upload_formats
-                domain["format_id"] = [
-                    ("type", "=", "up"),
-                    ("id", "in", upload_formats.ids),
-                ]
-        return {"domain": domain}
 
     @api.onchange("upload_data")
     def _onchange_upload_data(self):
diff --git a/account_ebics/wizards/ebics_xfer.xml b/account_ebics/wizards/ebics_xfer.xml
index 5d319e2..3e604b0 100644
--- a/account_ebics/wizards/ebics_xfer.xml
+++ b/account_ebics/wizards/ebics_xfer.xml
@@ -69,8 +69,8 @@
           <field name="upload_format_ids" invisible="1" />
           <field
                         name="format_id"
-                        domain="[('id', 'in', upload_format_ids)]"
                         required="1"
+                        domain="[('type', '=', 'up'), ('id', 'in', allowed_format_ids)]"
                         readonly="context.get('active_model') == 'account.payment.order'"
                     />
           <field name="order_type" />