diff --git a/_config/mailer.yml b/_config/mailer.yml
index 541927251..d930bac90 100644
--- a/_config/mailer.yml
+++ b/_config/mailer.yml
@@ -11,18 +11,7 @@ SilverStripe\Core\Injector\Injector:
     calls:
       - [addSubscriber, ['%$SilverStripe\Control\Email\MailerSubscriber']]
   Symfony\Component\Mailer\Transport\TransportInterface:
-    factory: Symfony\Component\Mailer\Transport
-    factory_method: fromDsn
+    factory: SilverStripe\Control\Email\TransportFactory
     constructor:
       dsn: 'sendmail://default'
       dispatcher: '%$Symfony\Component\EventDispatcher\EventDispatcherInterface.mailer'
----
-Name: mailer-dsn-env
-After: '*'
-Only:
-  envvarset: MAILER_DSN
----
-SilverStripe\Core\Injector\Injector:
-  Symfony\Component\Mailer\Transport\TransportInterface:
-    constructor:
-      dsn: '`MAILER_DSN`'
diff --git a/src/Control/Email/TransportFactory.php b/src/Control/Email/TransportFactory.php
new file mode 100644
index 000000000..c8c656c80
--- /dev/null
+++ b/src/Control/Email/TransportFactory.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace SilverStripe\Control\Email;
+
+use SilverStripe\Core\Environment;
+use SilverStripe\Core\Injector\Factory;
+use Symfony\Component\Mailer\Transport;
+
+/**
+ * Creates an email transport from a DSN string
+ * A DSN defined in an environment variable has priority over a DSN defined in yml config file
+ */
+class TransportFactory implements Factory
+{
+    public function create($service, array $params = [])
+    {
+        $dsn = Environment::getEnv('MAILER_DSN') ?: $params['dsn'];
+        $dispatcher = $params['dispatcher'];
+        return Transport::fromDsn($dsn, $dispatcher);
+    }
+}