diff --git a/ProcessMaker/Multitenancy/SwitchTenant.php b/ProcessMaker/Multitenancy/SwitchTenant.php
index 5753744480..e85c1421f7 100644
--- a/ProcessMaker/Multitenancy/SwitchTenant.php
+++ b/ProcessMaker/Multitenancy/SwitchTenant.php
@@ -89,7 +89,7 @@ private function overrideConfigs(Application $app, IsTenant $tenant)
     {
         $this->setEnvironmentVariable('APP_URL', $tenant->config['app.url']);
 
-        $this->setConfig('app.instance', $this->landlordConfig('app.instance') . '_' . $tenant->id);
+        $this->setConfig('app.instance', $tenant->database);
         $this->setConfig('app.url', $tenant->config['app.url']);
 
         // Microservice callback url