diff --git a/app/Ninja/Mailers/Mailer.php b/app/Ninja/Mailers/Mailer.php
index f470afbaee9c..95be8ab1443a 100644
--- a/app/Ninja/Mailers/Mailer.php
+++ b/app/Ninja/Mailers/Mailer.php
@@ -79,7 +79,13 @@ class Mailer
                             config(['mail.' . $field => $value]);
                         }
                     }
-                    (new \Illuminate\Mail\MailServiceProvider(app()))->register();
+
+                    $app = \App::getInstance();
+                    $app->singleton('swift.transport', function ($app) {
+                        return new \Illuminate\Mail\TransportManager($app);
+                    });
+                    $mailer = new \Swift_Mailer($app['swift.transport']->driver());
+                    Mail::setSwiftMailer($mailer);
                 }
             }
         }