diff --git a/mail_system/templates/postfix/aliases.cf b/mail_system/templates/postfix/aliases.cf
index d5f1e69..e423af7 100644
--- a/mail_system/templates/postfix/aliases.cf
+++ b/mail_system/templates/postfix/aliases.cf
@@ -7,4 +7,4 @@ user = {{ mailserver.postgresql.username }}
 password = {{ mailserver.postgresql.password }}
 dbname = {{ mailserver.postgresql.dbname }}
 hosts = {{ mailserver.postgresql.host }}
-query = SELECT unnest(forwardings) FROM aliases WHERE alias = '%s'
+query = SELECT unnest(a.forwardings) FROM aliases a JOIN domains d ON a.alias_domain_id=d.id WHERE a.alias || '@' || d.name = '%s'