diff --git a/src/EventListener/GeneratePageListener.php b/src/EventListener/GeneratePageListener.php
index 7cfa178..52013d3 100644
--- a/src/EventListener/GeneratePageListener.php
+++ b/src/EventListener/GeneratePageListener.php
@@ -127,6 +127,13 @@ public function __invoke(PageModel $pageModel, LayoutModel $layoutModel, PageReg
             if ([] !== $arrGlossaryItems)
             {
                 $glossaryConfig = json_encode($arrGlossaryItems);
+
+                // Tag the glossary items
+                if (System::getContainer()->has('fos_http_cache.http.symfony_response_tagger'))
+                {
+                    $responseTagger = System::getContainer()->get('fos_http_cache.http.symfony_response_tagger');
+                    $responseTagger->addTags(array_map(static fn ($id) => 'contao.db.tl_glossary_item.'.$id, array_column($arrGlossaryItems, 'id')));
+                }
             }
         }
 
@@ -145,13 +152,6 @@ public function __invoke(PageModel $pageModel, LayoutModel $layoutModel, PageReg
 
         $objTemplate->glossaryConfig = $glossaryConfig;
 
-        // Tag glossary items
-        if (System::getContainer()->has('fos_http_cache.http.symfony_response_tagger'))
-        {
-            $responseTagger = System::getContainer()->get('fos_http_cache.http.symfony_response_tagger');
-            $responseTagger->addTags(array_map(static fn ($id) => 'contao.db.tl_glossary_item.'.$id, array_column($arrGlossaryItems, 'id')));
-        }
-
         $GLOBALS['TL_BODY'][] = $objTemplate->parse();
     }
 }