1 files changed, 1 insertions, 3 deletions
diff --git a/libraries/classes/Template.php b/libraries/classes/Template.php
index eb04e5ba57..a42c3c13f3 100644
--- a/libraries/classes/Template.php
+++ b/libraries/classes/Template.php
@@ -63,8 +63,6 @@ class Template
 
     public static function getTwigEnvironment(?string $cacheDir): Environment
     {
-        $GLOBALS['containerBuilder'] = $GLOBALS['containerBuilder'] ?? null;
-
         /* Twig expects false when cache is not configured */
         if ($cacheDir === null) {
             $cacheDir = false;
@@ -76,7 +74,7 @@ class Template
             'cache' => $cacheDir,
         ]);
 
-        $twig->addRuntimeLoader(new ContainerRuntimeLoader($GLOBALS['containerBuilder']));
+        $twig->addRuntimeLoader(new ContainerRuntimeLoader(Core::getContainerBuilder()));
 
         if (is_array($GLOBALS['cfg']) && ($GLOBALS['cfg']['environment'] ?? '') === 'development') {
             $twig->enableDebug();