diff --git a/modules/core/templates/frontpage_config.tpl.php b/modules/core/templates/frontpage_config.tpl.php
index aeaa64af1d337a26f992286681715319f2da1c97..3e4b52701732b1cc731bd0a0556a3ce1e49b9f45 100644
--- a/modules/core/templates/frontpage_config.tpl.php
+++ b/modules/core/templates/frontpage_config.tpl.php
@@ -67,11 +67,7 @@ if ($this->data['isadmin']) {
 		echo '<h2>' . $this->t('{core:frontpage:warnings}') . '</h2>';
 
 		foreach($this->data['warnings'] AS $warning) {
-			if (is_array($warning)) {
-				echo '<div class="caution">' . $this->t($warning[0], $warning[1]) . '</div>';
-			} else {
-				echo '<div class="caution">'.$this->t($warning).'</div>';
-			}
+			echo '<div class="caution">'.$warning.'</div>';
 		}
 	}
 ?>
diff --git a/modules/core/templates/frontpage_config.twig b/modules/core/templates/frontpage_config.twig
index 21a65bbfdef3ef4c26c4597542102f76fabe11bb..20802aebb37ec7188b70184c00edad050a0b5a0c 100644
--- a/modules/core/templates/frontpage_config.twig
+++ b/modules/core/templates/frontpage_config.twig
@@ -35,11 +35,7 @@
     {% if warnings is defined and warnings is not empty %}
     <h2>{{ '{core:frontpage:warnings}'|trans|escape('html') }}</h2>
     {% for key, warning in warnings %}
-    {% if warning is iterable %}
-    <div class="caution">{{ warning[0]|trans(warning[1], "app")|raw }}</div>
-    {% else %}
-    <div class="caution">{{ warning|trans|raw }}</div>
-    {% endif %}
+    <div class="caution">{{ warning|raw }}</div>
     {% endfor %}
     {% endif %}
 
diff --git a/modules/core/www/frontpage_config.php b/modules/core/www/frontpage_config.php
index be6ed2cd18fc80655980e0b9d58c0e571ca5ef02..5a621107cf495e1ad186173deedfc72a664a00cb 100644
--- a/modules/core/www/frontpage_config.php
+++ b/modules/core/www/frontpage_config.php
@@ -164,6 +164,14 @@ $t->data['pageid'] = 'frontpage_config';
 $t->data['header'] = $translator->t('{core:frontpage:page_title}');
 $t->data['isadmin'] = $isadmin;
 $t->data['loginurl'] = $loginurl;
+
+foreach ($warnings as &$warning) {
+    if (is_array($warning)) {
+        $warning = $translator->t($warning[0], $warning[1]);
+    } else {
+        $warning = $translator->t($warning);
+    }
+}
 $t->data['warnings'] = $warnings;