diff --git a/core/legacy/LegacyHandler.php b/core/legacy/LegacyHandler.php
index c8a23913b..9d34263d3 100644
--- a/core/legacy/LegacyHandler.php
+++ b/core/legacy/LegacyHandler.php
@@ -165,6 +165,7 @@ abstract class LegacyHandler
 
     /**
      * Start Legacy Suite app
+     * @param string $currentModule
      * @return void
      * Based on @see SugarApplication::execute
      * Not calling:
@@ -174,7 +175,7 @@ abstract class LegacyHandler
      * - controller->execute();
      * - sugar_cleanup
      */
-    protected function startLegacyApp(): void
+    protected function startLegacyApp(string $currentModule = ''): void
     {
         if ($this->state->isLegacyStarted()) {
             return;
@@ -194,8 +195,8 @@ abstract class LegacyHandler
         }
 
         $module = $app->default_module;
-        if (!empty($_REQUEST['module'])) {
-            $module = $_REQUEST['module'];
+        if (!empty($currentModule)) {
+            $module = $currentModule;
         }
 
         /** @var SugarController $controller */
diff --git a/core/legacy/ViewDefinitionsHandler.php b/core/legacy/ViewDefinitionsHandler.php
index 3dd3f4854..c243f80aa 100644
--- a/core/legacy/ViewDefinitionsHandler.php
+++ b/core/legacy/ViewDefinitionsHandler.php
@@ -141,6 +141,8 @@ class ViewDefinitionsHandler extends LegacyHandler implements ViewDefinitionsPro
 
         $legacyModuleName = $this->validateModuleName($moduleName);
 
+        $this->startLegacyApp($legacyModuleName);
+
         $viewDef = new ViewDefinition();
         $viewDef->setId($moduleName);
 
diff --git a/tests/_mock/Mock/core/legacy/Statistics/AssignedUserOpportunitiesCountMock.php b/tests/_mock/Mock/core/legacy/Statistics/AssignedUserOpportunitiesCountMock.php
index e2de9dac4..5b95e3621 100644
--- a/tests/_mock/Mock/core/legacy/Statistics/AssignedUserOpportunitiesCountMock.php
+++ b/tests/_mock/Mock/core/legacy/Statistics/AssignedUserOpportunitiesCountMock.php
@@ -20,7 +20,10 @@ class AssignedUserOpportunitiesCountMock extends AssignedUserOpportunitiesCount
         return $this->getMockQueryResults();
     }
 
-    protected function startLegacyApp(): void
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
     {
     }
 
diff --git a/tests/_mock/Mock/core/legacy/Statistics/CaseDaysOpenMock.php b/tests/_mock/Mock/core/legacy/Statistics/CaseDaysOpenMock.php
index e2cfa1cf3..ee5aaa93c 100644
--- a/tests/_mock/Mock/core/legacy/Statistics/CaseDaysOpenMock.php
+++ b/tests/_mock/Mock/core/legacy/Statistics/CaseDaysOpenMock.php
@@ -2,10 +2,10 @@
 
 namespace App\Tests\_mock\Mock\core\legacy\Statistics;
 
-use App\Legacy\Statistics\CaseDaysOpen;
-use Doctrine\ORM\EntityManagerInterface;
 use aCase;
+use App\Legacy\Statistics\CaseDaysOpen;
 use App\Tests\_mock\Helpers\core\legacy\Data\DBQueryResultsMocking;
+use Doctrine\ORM\EntityManagerInterface;
 use SugarBean;
 
 /**
@@ -38,7 +38,10 @@ class CaseDaysOpenMock extends CaseDaysOpen
         return $this->case;
     }
 
-    protected function startLegacyApp(): void
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
     {
     }
 
diff --git a/tests/_mock/Mock/core/legacy/Statistics/CasesPerAccountMock.php b/tests/_mock/Mock/core/legacy/Statistics/CasesPerAccountMock.php
index 4975cd6f0..99fe54cef 100644
--- a/tests/_mock/Mock/core/legacy/Statistics/CasesPerAccountMock.php
+++ b/tests/_mock/Mock/core/legacy/Statistics/CasesPerAccountMock.php
@@ -2,11 +2,9 @@
 
 namespace Mock\Core\Legacy\Statistics;
 
-use AcceptanceTester;
+use aCase;
 use App\Legacy\Statistics\CasesPerAccount;
 use App\Tests\_mock\Helpers\core\legacy\Data\DBQueryResultsMocking;
-use SugarBean;
-use aCase;
 use BeanFactory;
 
 class CasesPerAccountMock extends CasesPerAccount
@@ -34,7 +32,10 @@ class CasesPerAccountMock extends CasesPerAccount
         return $this->getMockQueryResults();
     }
 
-    protected function startLegacyApp(): void
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
     {
     }
 
diff --git a/tests/_mock/Mock/core/legacy/Statistics/DaysUntilDueTaskMock.php b/tests/_mock/Mock/core/legacy/Statistics/DaysUntilDueTaskMock.php
index 107256550..71c9cba71 100644
--- a/tests/_mock/Mock/core/legacy/Statistics/DaysUntilDueTaskMock.php
+++ b/tests/_mock/Mock/core/legacy/Statistics/DaysUntilDueTaskMock.php
@@ -3,8 +3,8 @@
 namespace App\Tests\_mock\Mock\core\legacy\Statistics;
 
 use App\Legacy\Statistics\DaysUntilDueTask;
-use Task;
 use App\Tests\_mock\Helpers\core\legacy\Data\DBQueryResultsMocking;
+use Task;
 
 /**
  * Class DaysUntilDueTaskMock
@@ -36,7 +36,10 @@ class DaysUntilDueTaskMock extends DaysUntilDueTask
         return $this->task;
     }
 
-    protected function startLegacyApp(): void
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
     {
     }
 
diff --git a/tests/_mock/Mock/core/legacy/Statistics/LeadDaysOpenMock.php b/tests/_mock/Mock/core/legacy/Statistics/LeadDaysOpenMock.php
index c862ca5b3..49c9d6547 100644
--- a/tests/_mock/Mock/core/legacy/Statistics/LeadDaysOpenMock.php
+++ b/tests/_mock/Mock/core/legacy/Statistics/LeadDaysOpenMock.php
@@ -3,9 +3,9 @@
 namespace App\Tests\_mock\Mock\core\legacy\Statistics;
 
 use App\Legacy\Statistics\LeadDaysOpen;
+use App\Tests\_mock\Helpers\core\legacy\Data\DBQueryResultsMocking;
 use Doctrine\ORM\EntityManagerInterface;
 use Lead;
-use App\Tests\_mock\Helpers\core\legacy\Data\DBQueryResultsMocking;
 use SugarBean;
 
 /**
@@ -38,7 +38,10 @@ class LeadDaysOpenMock extends LeadDaysOpen
         return $this->lead;
     }
 
-    protected function startLegacyApp(): void
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
     {
     }
 
diff --git a/tests/_mock/Mock/core/legacy/Statistics/OpportunitySalesStageTimeSpanMock.php b/tests/_mock/Mock/core/legacy/Statistics/OpportunitySalesStageTimeSpanMock.php
index 045838839..e3351bfd7 100644
--- a/tests/_mock/Mock/core/legacy/Statistics/OpportunitySalesStageTimeSpanMock.php
+++ b/tests/_mock/Mock/core/legacy/Statistics/OpportunitySalesStageTimeSpanMock.php
@@ -3,8 +3,8 @@
 namespace App\Tests\_mock\Mock\core\legacy\Statistics;
 
 use App\Legacy\Statistics\OpportunitySalesStageTimeSpan;
-use Doctrine\ORM\EntityManagerInterface;
 use App\Tests\_mock\Helpers\core\legacy\Data\DBQueryResultsMocking;
+use Doctrine\ORM\EntityManagerInterface;
 use Opportunity;
 use SugarBean;
 
@@ -38,7 +38,10 @@ class OpportunitySalesStageTimeSpanMock extends OpportunitySalesStageTimeSpan
         return $this->opp;
     }
 
-    protected function startLegacyApp(): void
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
     {
     }
 
diff --git a/tests/_mock/Mock/core/legacy/Statistics/OpportunitySizeAnalysisMock.php b/tests/_mock/Mock/core/legacy/Statistics/OpportunitySizeAnalysisMock.php
index bd061a2a9..d7e296ea9 100644
--- a/tests/_mock/Mock/core/legacy/Statistics/OpportunitySizeAnalysisMock.php
+++ b/tests/_mock/Mock/core/legacy/Statistics/OpportunitySizeAnalysisMock.php
@@ -20,7 +20,10 @@ class OpportunitySizeAnalysisMock extends OpportunitySizeAnalysis
         return $this->getMockQueryResults();
     }
 
-    protected function startLegacyApp(): void
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
     {
     }
 
diff --git a/tests/_mock/Mock/core/legacy/Statistics/Series/LeadsByStatusCountMock.php b/tests/_mock/Mock/core/legacy/Statistics/Series/LeadsByStatusCountMock.php
index b42141d70..197fc18a4 100644
--- a/tests/_mock/Mock/core/legacy/Statistics/Series/LeadsByStatusCountMock.php
+++ b/tests/_mock/Mock/core/legacy/Statistics/Series/LeadsByStatusCountMock.php
@@ -35,7 +35,10 @@ class LeadsByStatusCountMock extends LeadsByStatusCount
         $this->bean = $bean;
     }
 
-    protected function startLegacyApp(): void
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
     {
     }
 
diff --git a/tests/_mock/Mock/core/legacy/Statistics/Series/OpportunitiesBySalesStagePipelineMock.php b/tests/_mock/Mock/core/legacy/Statistics/Series/OpportunitiesBySalesStagePipelineMock.php
index f1df4a72a..19e70d5fc 100644
--- a/tests/_mock/Mock/core/legacy/Statistics/Series/OpportunitiesBySalesStagePipelineMock.php
+++ b/tests/_mock/Mock/core/legacy/Statistics/Series/OpportunitiesBySalesStagePipelineMock.php
@@ -35,7 +35,10 @@ class OpportunitiesBySalesStagePipelineMock extends OpportunitiesBySalesStagePip
         $this->bean = $bean;
     }
 
-    protected function startLegacyApp(): void
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
     {
     }
 
@@ -47,6 +50,9 @@ class OpportunitiesBySalesStagePipelineMock extends OpportunitiesBySalesStagePip
         return $this->getAllMockQueryResults();
     }
 
+    /**
+     * @inheritDoc
+     */
     protected function generateQuery(array $query): array
     {
         return [
diff --git a/tests/_mock/Mock/core/legacy/Statistics/SubPanelActivitiesNextDateMock.php b/tests/_mock/Mock/core/legacy/Statistics/SubPanelActivitiesNextDateMock.php
index 3956addf6..fd1e80ec9 100644
--- a/tests/_mock/Mock/core/legacy/Statistics/SubPanelActivitiesNextDateMock.php
+++ b/tests/_mock/Mock/core/legacy/Statistics/SubPanelActivitiesNextDateMock.php
@@ -35,7 +35,10 @@ class SubPanelActivitiesNextDateMock extends SubPanelActivitiesNextDate
         return $this->getMockQueryResults();
     }
 
-    protected function startLegacyApp(): void
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
     {
     }
 }
diff --git a/tests/_mock/Mock/core/legacy/Statistics/SubPanelCampaignLastReceivedMock.php b/tests/_mock/Mock/core/legacy/Statistics/SubPanelCampaignLastReceivedMock.php
index 2bb7f9315..b337a6ed4 100644
--- a/tests/_mock/Mock/core/legacy/Statistics/SubPanelCampaignLastReceivedMock.php
+++ b/tests/_mock/Mock/core/legacy/Statistics/SubPanelCampaignLastReceivedMock.php
@@ -35,7 +35,10 @@ class SubPanelCampaignLastReceivedMock extends SubPanelCampaignsLastReceived
         return $this->getMockQueryResults();
     }
 
-    protected function startLegacyApp(): void
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
     {
     }
 }
diff --git a/tests/_mock/Mock/core/legacy/Statistics/SubPanelCasesCountMock.php b/tests/_mock/Mock/core/legacy/Statistics/SubPanelCasesCountMock.php
index 7a50b2847..59c1be8fa 100644
--- a/tests/_mock/Mock/core/legacy/Statistics/SubPanelCasesCountMock.php
+++ b/tests/_mock/Mock/core/legacy/Statistics/SubPanelCasesCountMock.php
@@ -34,7 +34,10 @@ class SubPanelCasesCountMock extends SubPanelCasesCount
         return $this->getMockQueryResults();
     }
 
-    protected function startLegacyApp(): void
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
     {
     }
 }
diff --git a/tests/_mock/Mock/core/legacy/Statistics/SubPanelContractsRenewalDateMock.php b/tests/_mock/Mock/core/legacy/Statistics/SubPanelContractsRenewalDateMock.php
index fc8132a6e..b7946756b 100644
--- a/tests/_mock/Mock/core/legacy/Statistics/SubPanelContractsRenewalDateMock.php
+++ b/tests/_mock/Mock/core/legacy/Statistics/SubPanelContractsRenewalDateMock.php
@@ -36,7 +36,10 @@ class SubPanelContractsRenewalDateMock extends SubPanelContractsRenewalDate
         return $this->getMockQueryResults();
     }
 
-    protected function startLegacyApp(): void
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
     {
     }
 }
diff --git a/tests/_mock/Mock/core/legacy/Statistics/SubPanelEventsLastDateMock.php b/tests/_mock/Mock/core/legacy/Statistics/SubPanelEventsLastDateMock.php
index 91a9e4f39..40c78c50b 100644
--- a/tests/_mock/Mock/core/legacy/Statistics/SubPanelEventsLastDateMock.php
+++ b/tests/_mock/Mock/core/legacy/Statistics/SubPanelEventsLastDateMock.php
@@ -35,7 +35,10 @@ class SubPanelEventsLastDateMock extends SubPanelEventsLastDate
         return $this->getMockQueryResults();
     }
 
-    protected function startLegacyApp(): void
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
     {
     }
 }
diff --git a/tests/_mock/Mock/core/legacy/Statistics/SubPanelHistoryLastDateMock.php b/tests/_mock/Mock/core/legacy/Statistics/SubPanelHistoryLastDateMock.php
index 5c6479d92..c2c628441 100644
--- a/tests/_mock/Mock/core/legacy/Statistics/SubPanelHistoryLastDateMock.php
+++ b/tests/_mock/Mock/core/legacy/Statistics/SubPanelHistoryLastDateMock.php
@@ -40,7 +40,10 @@ class SubPanelHistoryLastDateMock extends SubPanelHistoryLastDate
         return $this->getMockQueryResults();
     }
 
-    protected function startLegacyApp(): void
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
     {
     }
 }
diff --git a/tests/_mock/Mock/core/legacy/Statistics/SubPanelInvoicesTotalMock.php b/tests/_mock/Mock/core/legacy/Statistics/SubPanelInvoicesTotalMock.php
index cc07bc794..abd611cc0 100644
--- a/tests/_mock/Mock/core/legacy/Statistics/SubPanelInvoicesTotalMock.php
+++ b/tests/_mock/Mock/core/legacy/Statistics/SubPanelInvoicesTotalMock.php
@@ -34,7 +34,10 @@ class SubPanelInvoicesTotalMock extends SubPanelInvoicesTotal
         return $this->getMockQueryResults();
     }
 
-    protected function startLegacyApp(): void
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
     {
     }
 }
diff --git a/tests/_mock/Mock/core/legacy/Statistics/SubPanelQuotesTotalMock.php b/tests/_mock/Mock/core/legacy/Statistics/SubPanelQuotesTotalMock.php
index c51b369bf..6c32f4048 100644
--- a/tests/_mock/Mock/core/legacy/Statistics/SubPanelQuotesTotalMock.php
+++ b/tests/_mock/Mock/core/legacy/Statistics/SubPanelQuotesTotalMock.php
@@ -36,7 +36,10 @@ class SubPanelQuotesTotalMock extends SubPanelQuotesTotal
         return $this->getMockQueryResults();
     }
 
-    protected function startLegacyApp(): void
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
     {
     }
 }
diff --git a/tests/_mock/Mock/core/legacy/Statistics/SubpanelOpportunitiesTotalMock.php b/tests/_mock/Mock/core/legacy/Statistics/SubpanelOpportunitiesTotalMock.php
index 5d38a4c84..39e783657 100644
--- a/tests/_mock/Mock/core/legacy/Statistics/SubpanelOpportunitiesTotalMock.php
+++ b/tests/_mock/Mock/core/legacy/Statistics/SubpanelOpportunitiesTotalMock.php
@@ -34,7 +34,10 @@ class SubpanelOpportunitiesTotalMock extends SubpanelOpportunitiesTotal
         return $this->getMockQueryResults();
     }
 
-    protected function startLegacyApp(): void
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
     {
     }
 }
diff --git a/tests/_mock/Mock/core/legacy/Statistics/WonOpportunityAmountByYearMock.php b/tests/_mock/Mock/core/legacy/Statistics/WonOpportunityAmountByYearMock.php
index 5e9346364..807b6d424 100644
--- a/tests/_mock/Mock/core/legacy/Statistics/WonOpportunityAmountByYearMock.php
+++ b/tests/_mock/Mock/core/legacy/Statistics/WonOpportunityAmountByYearMock.php
@@ -34,7 +34,10 @@ class WonOpportunityAmountByYearMock extends WonOpportunityAmountByYear
         return $this->getMockQueryResults();
     }
 
-    protected function startLegacyApp(): void
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
     {
     }
 }
diff --git a/tests/_mock/Mock/core/legacy/ViewDefinitionsHandlerMock.php b/tests/_mock/Mock/core/legacy/ViewDefinitionsHandlerMock.php
new file mode 100644
index 000000000..311b29d74
--- /dev/null
+++ b/tests/_mock/Mock/core/legacy/ViewDefinitionsHandlerMock.php
@@ -0,0 +1,18 @@
+<?php
+
+
+namespace App\Tests\_mock\Mock\core\legacy;
+
+
+use App\Legacy\ViewDefinitionsHandler;
+
+class ViewDefinitionsHandlerMock extends ViewDefinitionsHandler
+{
+
+    /**
+     * @inheritDoc
+     */
+    protected function startLegacyApp(string $currentModule = ''): void
+    {
+    }
+}
diff --git a/tests/unit/core/legacy/ViewDefinitionsHandlerTest.php b/tests/unit/core/legacy/ViewDefinitionsHandlerTest.php
index bfe6a0471..c77420db6 100644
--- a/tests/unit/core/legacy/ViewDefinitionsHandlerTest.php
+++ b/tests/unit/core/legacy/ViewDefinitionsHandlerTest.php
@@ -9,7 +9,6 @@ use App\Legacy\ModuleNameMapperHandler;
 use App\Legacy\ViewDefinitions\ListViewDefinitionHandler;
 use App\Legacy\ViewDefinitions\RecordViewDefinitionHandler;
 use App\Legacy\ViewDefinitions\SubPanelDefinitionHandler;
-use App\Legacy\ViewDefinitionsHandler;
 use App\Service\AclManagerInterface;
 use App\Service\BulkActionDefinitionProvider;
 use App\Service\FilterDefinitionProvider;
@@ -17,6 +16,7 @@ use App\Service\FilterDefinitionProviderInterface;
 use App\Service\LineActionDefinitionProvider;
 use App\Service\ListViewSidebarWidgetDefinitionProvider;
 use App\Service\RecordActionDefinitionProvider;
+use App\Tests\_mock\Mock\core\legacy\ViewDefinitionsHandlerMock;
 use App\Tests\UnitTester;
 use Codeception\Test\Unit;
 use Exception;
@@ -35,7 +35,7 @@ final class ViewDefinitionsHandlerTest extends Unit
     protected $tester;
 
     /**
-     * @var ViewDefinitionsHandler
+     * @var ViewDefinitionsHandlerMock
      */
     private $viewDefinitionHandler;
 
@@ -270,7 +270,7 @@ final class ViewDefinitionsHandlerTest extends Unit
             $filterDefinitionHandler
         );
 
-        $this->viewDefinitionHandler = new ViewDefinitionsHandler(
+        $this->viewDefinitionHandler = new ViewDefinitionsHandlerMock(
             $projectDir,
             $legacyDir,
             $legacySessionName,