diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 8c41357187..39b25759cc 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use App\Http\Middleware\ConnectTenantDatabase;
 use App\Models\LegacyInstitution;
 use App\Providers\Postgres\DatabaseServiceProvider;
 use App\Services\CacheManager;
@@ -60,6 +61,8 @@ private function loadLegacyBootstrap()
      */
     public function boot()
     {
+        ConnectTenantDatabase::setTenantResolver(fn () => config('database.default'));
+        
         if ($this->app->runningInConsole()) {
             $this->loadLegacyMigrations();
         }