diff --git a/core/Archive.php b/core/Archive.php
index 6ef1ccb09a..7257af6e73 100644
--- a/core/Archive.php
+++ b/core/Archive.php
@@ -827,10 +827,7 @@ class Archive implements ArchiveQuery
     {
         $coreAdminHomeApi = API::getInstance();
 
-        $requestedReport = null;
-        if (SettingsServer::isArchivePhpTriggered()) {
-            $requestedReport = Common::getRequestVar('requestedReport', '', 'string');
-        }
+        $requestedReport = Common::getRequestVar('requestedReport', '', 'string');
 
         $periodString = $period->getRangeString();
         $periodDateStr = $period->getLabel() == 'range' ? $periodString : $period->getDateStart()->toString();
diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php
index ad0bd4121f..e663a7e307 100644
--- a/plugins/Goals/API.php
+++ b/plugins/Goals/API.php
@@ -26,6 +26,7 @@ use Piwik\Plugin\ReportsProvider;
 use Piwik\Plugins\Goals\Columns\Metrics\GoalConversionRate;
 use Piwik\Segment;
 use Piwik\Segment\SegmentExpression;
+use Piwik\SettingsServer;
 use Piwik\Site;
 use Piwik\Tracker\Cache;
 use Piwik\Tracker\GoalManager;
@@ -528,6 +529,9 @@ class API extends \Piwik\Plugin\API
     public function getMetrics($idSite, $period, $date, $segment = false, $idGoal = false, $columns = array(), $showAllGoalSpecificMetrics = false)
     {
         Piwik::checkUserHasViewAccess($idSite);
+
+        $this->setRequestedReportIfNeeded($idGoal, $period);
+
         $archive = Archive::build($idSite, $period, $date, $segment);
 
         $showAllGoalSpecificMetrics = $showAllGoalSpecificMetrics && $idGoal === false;
@@ -582,6 +586,8 @@ class API extends \Piwik\Plugin\API
         }, $columnsToGet);
         $dataTable = $archive->getDataTableFromNumeric($inDbMetricNames);
 
+        $this->unsetRequestedReportIfNeeded();
+
         if (count($columnsToGet) > 0) {
             $newNameMapping = array_combine($inDbMetricNames, $columnsToGet);
         } else {
@@ -681,6 +687,22 @@ class API extends \Piwik\Plugin\API
         return $this->getNumeric($idSite, $period, $date, $segment, Archiver::getRecordName('revenue', $idGoal));
     }
 
+    private function setRequestedReportIfNeeded($idGoal, $period)
+    {
+        if (!empty($idGoal) && $idGoal > 0 && $period === 'range'
+            && !SettingsServer::isArchivePhpTriggered()
+            && !isset($_GET['requestedReport'])) { // don't overwrite requested report if it's already requested for a different plugin or so
+            $_GET['requestedReport'] = 'goalreport_' . $idGoal;
+        }
+    }
+
+    private function unsetRequestedReportIfNeeded()
+    {
+        if (isset($_GET['requestedReport'])) { // todo only unset if we set it above
+            unset($_GET['requestedReport']);
+        }
+    }
+
     /**
      * Utility method that retrieve an archived DataTable for a specific site, date range,
      * segment and goal. If not goal is specified, this method will retrieve and sum the
@@ -699,6 +721,8 @@ class API extends \Piwik\Plugin\API
     {
         Piwik::checkUserHasViewAccess($idSite);
 
+        $this->setRequestedReportIfNeeded($idGoal, $period);
+
         $archive = Archive::build($idSite, $period, $date, $segment);
 
         // check for the special goal ids
@@ -708,6 +732,7 @@ class API extends \Piwik\Plugin\API
         $dataTable = $archive->getDataTable(Archiver::getRecordName($recordName, $realGoalId), $idSubtable = null);
         $dataTable->queueFilter('ReplaceColumnNames');
 
+        $this->unsetRequestedReportIfNeeded();
         return $dataTable;
     }
 
diff --git a/plugins/Goals/Archiver.php b/plugins/Goals/Archiver.php
index dc32c68538..1d49eda376 100644
--- a/plugins/Goals/Archiver.php
+++ b/plugins/Goals/Archiver.php
@@ -468,6 +468,9 @@ class Archiver extends \Piwik\Plugin\Archiver
 
         $fieldsToSum = array();
         foreach ($goalIdsToSum as $goalId) {
+            if (!$this->isRequestedReport($goalId)) {
+               continue;
+            }
             $metricsToSum = Goals::getGoalColumns($goalId);
             foreach ($metricsToSum as $metricName) {
                 $fieldsToSum[] = self::getRecordName($metricName, $goalId);
@@ -478,6 +481,9 @@ class Archiver extends \Piwik\Plugin\Archiver
         $columnsAggregationOperation = null;
 
         foreach ($goalIdsToSum as $goalId) {
+            if (!$this->isRequestedReport($goalId)) {
+                continue;
+            }
             // sum up the visits to conversion data table & the days to conversion data table
             $this->getProcessor()->aggregateDataTableRecords(
                 array(self::getRecordName(self::VISITS_UNTIL_RECORD_NAME, $goalId),
@@ -505,4 +511,11 @@ class Archiver extends \Piwik\Plugin\Archiver
         $this->getProcessor()->processDependentArchive('Goals', VisitFrequencyAPI::NEW_VISITOR_SEGMENT);
         $this->getProcessor()->processDependentArchive('Goals', VisitFrequencyAPI::RETURNING_VISITOR_SEGMENT);
     }
+
+    protected function isRequestedReport(string $reportName)
+    {
+        $requestedReport = $this->getProcessor()->getParams()->getArchiveOnlyReport();
+
+        return empty($requestedReport) || $requestedReport == 'goalreport_' . $reportName;
+    }
 }