diff --git a/application/views/components/google_analytics_script.php b/application/views/components/google_analytics_script.php
index 54473830..a69b8e89 100644
--- a/application/views/components/google_analytics_script.php
+++ b/application/views/components/google_analytics_script.php
@@ -4,7 +4,7 @@
  */
 ?>
 
-<?php if (substr($google_analytics_code, 0, 2) === 'UA'): ?>
+<?php if (substr($google_analytics_code ?? '', 0, 2) === 'UA'): ?>
     <script>
         (function(i,s,o,g,r,a,m){i["GoogleAnalyticsObject"]=r;i[r]=i[r]||function(){
             (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -15,7 +15,7 @@
     </script>
 <?php endif ?>
 
-<?php if (substr($google_analytics_code, 0, 2) === 'G-'): ?>
+<?php if (substr($google_analytics_code ?? '', 0, 2) === 'G-'): ?>
     <script async src="https://www.googletagmanager.com/gtag/js?id=' . $google_analytics_code . '"></script>
     <script>
         window.dataLayer = window.dataLayer || [];
diff --git a/application/views/components/matomo_analytics_script.php b/application/views/components/matomo_analytics_script.php
index 450cd095..d528c595 100644
--- a/application/views/components/matomo_analytics_script.php
+++ b/application/views/components/matomo_analytics_script.php
@@ -23,7 +23,8 @@
         })();
     </script>
 
-    <noscript><p><img src="<?= $matomo_analytics_url ?>matomo.php?idsite=1&amp;rec=1" style="border:0;" alt=""/></p>
+    <noscript>
+        <p><img src="<?= $matomo_analytics_url ?>matomo.php?idsite=1&amp;rec=1" style="border:0;" alt=""/></p>
     </noscript>
 
 <?php endif ?>