diff --git a/ProcessMaker/Multitenancy/SwitchTenant.php b/ProcessMaker/Multitenancy/SwitchTenant.php
index e85c1421f7..34e7a5be60 100644
--- a/ProcessMaker/Multitenancy/SwitchTenant.php
+++ b/ProcessMaker/Multitenancy/SwitchTenant.php
@@ -6,6 +6,7 @@
 use Illuminate\Contracts\Routing\UrlGenerator;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Env;
+use Illuminate\Support\Facades\Context;
 use Monolog\Handler\RotatingFileHandler;
 use ProcessMaker\Application;
 use ProcessMaker\Multitenancy\Broadcasting\TenantAwareBroadcastManager;
@@ -17,7 +18,7 @@ class SwitchTenant implements SwitchTenantTask
 {
     use UsesMultitenancyConfig;
 
-    public static $landlordValues = null;
+    private const LANDLORD_VALUES_CONTEXT_KEY = 'multitenancy.landlord_values';
 
     /**
      * Make the given tenant current.
@@ -31,9 +32,8 @@ public function makeCurrent(IsTenant $tenant): void
 
         \Log::debug('SwitchTenant: ' . $tenant->id, ['domain' => request()->getHost()]);
 
-        // Save the landlord values for later use
-        if (!self::$landlordValues) {
-            self::$landlordValues = $app->make('config')->all();
+        if (!Context::has(self::LANDLORD_VALUES_CONTEXT_KEY)) {
+            Context::add(self::LANDLORD_VALUES_CONTEXT_KEY, $app->make('config')->all());
         }
 
         // Set the tenant's domain in the request headers. Used for things like the global url() helper.
@@ -70,7 +70,7 @@ public function forgetCurrent(): void
 
     private function landlordConfig($key)
     {
-        return Arr::get(self::$landlordValues, $key);
+        return Arr::get(Context::get(self::LANDLORD_VALUES_CONTEXT_KEY), $key);
     }
 
     private function setConfig($key, $value)
diff --git a/ProcessMaker/Providers/ProcessMakerServiceProvider.php b/ProcessMaker/Providers/ProcessMakerServiceProvider.php
index 72c71c2a46..3706dac585 100644
--- a/ProcessMaker/Providers/ProcessMakerServiceProvider.php
+++ b/ProcessMaker/Providers/ProcessMakerServiceProvider.php
@@ -75,9 +75,6 @@ class ProcessMakerServiceProvider extends ServiceProvider
     // Track the query time for each request
     private static $queryTime = 0;
 
-    // Track the landlord values for multitenancy
-    private static $landlordValues = null;
-
     public function boot(): void
     {
         // Track the start time for service providers boot
diff --git a/tests/unit/ProcessMaker/Multitenancy/SwitchTenantTest.php b/tests/unit/ProcessMaker/Multitenancy/SwitchTenantTest.php
new file mode 100644
index 0000000000..e19db9daa0
--- /dev/null
+++ b/tests/unit/ProcessMaker/Multitenancy/SwitchTenantTest.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Tests\Unit\ProcessMaker\Multitenancy;
+
+use Illuminate\Support\Facades\Context;
+use ProcessMaker\Multitenancy\SwitchTenant;
+use Tests\TestCase;
+
+class SwitchTenantTest extends TestCase
+{
+    private const LANDLORD_VALUES_KEY = 'multitenancy.landlord_values';
+
+    protected function tearDown(): void
+    {
+        Context::forget(self::LANDLORD_VALUES_KEY);
+
+        parent::tearDown();
+    }
+
+    public function test_landlord_snapshot_persists_during_same_request(): void
+    {
+        config(['app.url' => 'https://landlord.example.com']);
+        Context::add(self::LANDLORD_VALUES_KEY, config()->all());
+
+        config(['app.url' => 'https://tenant-modified.example.com']);
+
+        $this->assertSame(
+            'https://landlord.example.com',
+            $this->landlordConfig('app.url')
+        );
+    }
+
+    public function test_landlord_values_are_not_reused_across_requests(): void
+    {
+        Context::add(self::LANDLORD_VALUES_KEY, ['app' => ['url' => 'https://tenant-a.example.com']]);
+        Context::forget(self::LANDLORD_VALUES_KEY);
+
+        config(['app.url' => 'https://tenant-b.example.com']);
+        Context::add(self::LANDLORD_VALUES_KEY, config()->all());
+
+        $this->assertSame(
+            'https://tenant-b.example.com',
+            Context::get(self::LANDLORD_VALUES_KEY)['app']['url']
+        );
+    }
+
+    private function landlordConfig(string $key): mixed
+    {
+        $method = new \ReflectionMethod(SwitchTenant::class, 'landlordConfig');
+
+        return $method->invoke(new SwitchTenant(), $key);
+    }
+}