diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 63803aa46499..fe9ea8505b5a 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -29,6 +29,7 @@ use App\Http\Middleware\QueryLogging;
 use App\Http\Middleware\RedirectIfAuthenticated;
 use App\Http\Middleware\SetDb;
 use App\Http\Middleware\SetDbByCompanyKey;
+use App\Http\Middleware\SetDefaultMailer;
 use App\Http\Middleware\SetDomainNameDb;
 use App\Http\Middleware\SetEmailDb;
 use App\Http\Middleware\SetInviteDb;
@@ -159,5 +160,6 @@ class Kernel extends HttpKernel
         'contact_key_login' => ContactKeyLogin::class,
         'check_client_existence' => CheckClientExistence::class,
         'user_verified' => UserVerified::class,
+        'default_mailer' => SetDefaultMailer::class,
     ];
 }
diff --git a/app/Http/Middleware/SetDefaultMailer.php b/app/Http/Middleware/SetDefaultMailer.php
new file mode 100644
index 000000000000..dec0e382ade9
--- /dev/null
+++ b/app/Http/Middleware/SetDefaultMailer.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Http\Middleware;
+
+use App\Libraries\MultiDB;
+use Closure;
+use Illuminate\Http\Request;
+use stdClass;
+
+class SetDefaultMailer
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  Request  $request
+     * @param Closure $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+
+        config(['mail.default' => config('mail.default')]);
+
+        return $next($request);
+    }
+}
diff --git a/routes/api.php b/routes/api.php
index 1dd0e044e87b..3363c54ffc3a 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -13,12 +13,12 @@
 
 use Illuminate\Support\Facades\Route;
 
-Route::group(['middleware' => ['api_secret_check']], function () {
+Route::group(['middleware' => ['api_secret_check', 'default_mailer']], function () {
     Route::post('api/v1/signup', 'AccountController@store')->name('signup.submit');
     Route::post('api/v1/oauth_login', 'Auth\LoginController@oauthApiLogin');
 });
 
-Route::group(['middleware' => ['api_secret_check', 'email_db']], function () {
+Route::group(['middleware' => ['api_secret_check', 'email_db', 'default_mailer']], function () {
     Route::post('api/v1/login', 'Auth\LoginController@apiLogin')->name('login.submit');
     Route::post('api/v1/reset_password', 'Auth\ForgotPasswordController@sendResetLinkEmail');
 });