diff --git a/SiteContentDetection/SpaPwa.php b/SiteContentDetection/SpaPwa.php
new file mode 100644
index 00000000..9af2063a
--- /dev/null
+++ b/SiteContentDetection/SpaPwa.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * Matomo - free/libre analytics platform
+ *
+ * @link    https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\TagManager\SiteContentDetection;
+
+use Piwik\Container\StaticContainer;
+use Piwik\Piwik;
+use Piwik\Plugins\SitesManager\SiteContentDetection\SiteContentDetectionAbstract;
+use Piwik\SiteContentDetector;
+use Piwik\View;
+
+class SpaPwa extends SiteContentDetectionAbstract
+{
+    public static function getName(): string
+    {
+        return 'SPA / PWA';
+    }
+
+    public static function getContentType(): string
+    {
+        return self::TYPE_JS_FRAMEWORK;
+    }
+
+    public static function getPriority(): int
+    {
+        return 70;
+    }
+
+    public function isDetected(?string $data = null, ?array $headers = null): bool
+    {
+        return false;
+    }
+
+    public function shouldShowInstructionTab(SiteContentDetector $detector = null): bool
+    {
+        return true;
+    }
+
+    public function renderInstructionsTab(SiteContentDetector $detector): string
+    {
+        $model = StaticContainer::get('Piwik\Plugins\TagManager\Model\Container');
+        $view = new View("@TagManager/trackingSPA");
+        $view->action = Piwik::getAction();
+        $view->showContainerRow = $model->getNumContainersTotal() > 1;
+        return $view->render();
+    }
+}
diff --git a/TagManager.php b/TagManager.php
index 8a5d3693..17601af5 100644
--- a/TagManager.php
+++ b/TagManager.php
@@ -61,6 +61,7 @@ public function registerEvents()
             'SitesManager.addSite.end' => 'onSiteAdded',
             'System.addSystemSummaryItems' => 'addSystemSummaryItems',
             'Template.endTrackingCodePage' => 'addTagManagerCode',
+            'Template.siteWithoutDataTab.MatomoTagManager.content' => 'setTagManagerCode',
             'Template.endTrackingHelpPage' => 'addTagManagerTrackingCodeHelp',
             'Template.endTrackingCodePageTableOfContents' => 'endTrackingCodePageTableOfContents',
             'Tracker.PageUrl.getQueryParametersToExclude' => 'getQueryParametersToExclude',
@@ -69,8 +70,7 @@ public function registerEvents()
             'Access.Capability.addCapabilities' => 'addCapabilities',
             'TwoFactorAuth.requiresTwoFactorAuthentication' => 'requiresTwoFactorAuthentication',
             'Db.getTablesInstalled' => 'getTablesInstalled',
-            'Template.embedReactTagManagerTrackingCode' => 'embedReactTagManagerTrackingCode',
-            'Template.embedSPATagManagerTrackingCode' => 'embedSPATagManagerTrackingCode',
+            'Template.siteWithoutDataTab.ReactJs.content' => 'embedReactTagManagerTrackingCode',
         );
     }
 
@@ -271,21 +271,18 @@ public function addTagManagerCode(&$out)
         $out .= $view->render();
     }
 
-    public function embedReactTagManagerTrackingCode(&$out)
+    public function setTagManagerCode(&$out)
     {
-        Piwik::checkUserHasSomeViewAccess();
-        $model = $this->getContainerModel();
-        $view = new View("@TagManager/trackingCodeReact");
-        $view->action = Piwik::getAction();
-        $view->showContainerRow = $model->getNumContainersTotal() > 1;
-        $out .= $view->render();
+        $newContent = '';
+        $this->addTagManagerCode($newContent);
+        $out = $newContent;
     }
 
-    public function embedSPATagManagerTrackingCode(&$out)
+    public function embedReactTagManagerTrackingCode(&$out)
     {
         Piwik::checkUserHasSomeViewAccess();
         $model = $this->getContainerModel();
-        $view = new View("@TagManager/trackingSPA");
+        $view = new View("@TagManager/trackingCodeReact");
         $view->action = Piwik::getAction();
         $view->showContainerRow = $model->getNumContainersTotal() > 1;
         $out .= $view->render();
diff --git a/templates/trackingSPA.twig b/templates/trackingSPA.twig
index e02536d9..02e2d0c5 100644
--- a/templates/trackingSPA.twig
+++ b/templates/trackingSPA.twig
@@ -1,6 +1,11 @@
+<p>{{ 'SitesManager_SiteWithoutDataSPADescription'|translate('<a href="https://matomo.org/guide/tag-manager/" target="_blank" rel="noreferrer noopener">', '</a>', '<a href="https://developer.matomo.org/guides/spa-tracking" target="_blank" rel="noreferrer noopener">', '</a>')|raw }}</p>
+<br>
+<p>{{ 'SitesManager_SiteWithoutDataCloudflareFollowStepsIntro'|translate }}</p>
 <div
         vue-entry="TagManager.TrackingSPAPage"
         current-action="{{ action|json_encode }}"
         show-container-row="{{ showContainerRow|json_encode }}"
 >
-</div>
\ No newline at end of file
+</div>
+<br>
+<p>{{ 'SitesManager_SiteWithoutDataSPAFollowStepCompleted'|translate('<strong>','</strong>')|raw }}</p>
\ No newline at end of file