diff --git a/templates/postfix/pgsql-transport-maps.cf b/templates/postfix/pgsql-transport-maps.cf
index 5971e34..2e9b26a 100644
--- a/templates/postfix/pgsql-transport-maps.cf
+++ b/templates/postfix/pgsql-transport-maps.cf
@@ -10,8 +10,10 @@ dbname = {{ env['DB_NAME'] }}
 {% if env['SIMPLELOGIN_COMPATIBILITY_MODE'] == 'v4' %}
 query = SELECT 'smtp:{{ env["EMAIL_HANDLER_HOST"] }}:20381' FROM custom_domain WHERE domain = '%s' AND verified=true
     UNION SELECT 'smtp:{{ env["EMAIL_HANDLER_HOST"] }}:20381' FROM public_domain WHERE domain = '%s'
-    UNION SELECT 'smtp:{{ env["EMAIL_HANDLER_HOST"] }}:20381' WHERE '%s' = '{{ env["ALIASES_DEFAULT_DOMAIN"] }}' LIMIT 1;
+    UNION SELECT 'smtp:{{ env["EMAIL_HANDLER_HOST"] }}:20381' WHERE '%s' = '{{ env["ALIASES_DEFAULT_DOMAIN"] }}'
+    UNION SELECT 'smtp:{{ env["EMAIL_HANDLER_HOST"] }}:20381' WHERE '%s' = '{{ env["POSTFIX_FQDN"] }}' LIMIT 1;
 {% else %}
 query = SELECT 'smtp:{{ env["EMAIL_HANDLER_HOST"] }}:20381' FROM custom_domain WHERE domain = '%s' AND verified=true
-    UNION SELECT 'smtp:{{ env["EMAIL_HANDLER_HOST"] }}:20381' WHERE '%s' = '{{ env["ALIASES_DEFAULT_DOMAIN"] }}' LIMIT 1;
+    UNION SELECT 'smtp:{{ env["EMAIL_HANDLER_HOST"] }}:20381' WHERE '%s' = '{{ env["ALIASES_DEFAULT_DOMAIN"] }}'
+    UNION SELECT 'smtp:{{ env["EMAIL_HANDLER_HOST"] }}:20381' WHERE '%s' = '{{ env["POSTFIX_FQDN"] }}' LIMIT 1;
 {% endif %}