diff --git a/config/services.php b/config/services.php
index 85b8cbd11560..aec15f6fc8d7 100644
--- a/config/services.php
+++ b/config/services.php
@@ -4,8 +4,6 @@ return [
 
     'analytics' => [
         'tracking_id' => env('TRACKING_ID'),
-        'matomo_url' => env('MATOMO_URL', false),
-        'matomo_id' => env('MATOMO_ID', false),
     ],
 
     /*
diff --git a/resources/views/portal/ninja2020/layout/app.blade.php b/resources/views/portal/ninja2020/layout/app.blade.php
index 78c8ecc1d8ec..23e6f36be1b0 100644
--- a/resources/views/portal/ninja2020/layout/app.blade.php
+++ b/resources/views/portal/ninja2020/layout/app.blade.php
@@ -3,7 +3,7 @@
 
     <head>
         <!-- Error: {{ session('error') }} -->
-        @if (config('services.analytics.matomo_url') && config('services.analytics.matomo_id'))
+        @if ($company && $company->matomo_url && $company->matomo_id)
             <script>
                 var _paq = window._paq = window._paq || [];
                 /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
@@ -11,14 +11,14 @@
                 _paq.push(['enableLinkTracking']);
                 _paq.push(['setUserId', '{{ auth()->guard('contact')->user()->company->present()->name }}']);
                 (function() {
-                var u="{{ config('services.analytics.matomo_url') }}";
+                var u="{{ $company->matomo_url }}";
                 _paq.push(['setTrackerUrl', u+'matomo.php']);
-                _paq.push(['setSiteId', '{{ config('services.analytics.matomo_id') }}']);
+                _paq.push(['setSiteId', '{{ $company->matomo_id }}']);
                 var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
                 g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
                 })();
             </script>
-            <noscript><p><img src="{{ config('services.analytics.matomo_url) }}/matomo.php?idsite={{ config('services.analytics.matomo_id') }}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
+            <noscript><p><img src="{{ auth()->guard('contact')->user()->company->matomo_url }}/matomo.php?idsite={{ auth()->guard('contact')->user()->company->matomo_id }}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
         @elseif (config('services.analytics.tracking_id'))
             <script async src="https://www.googletagmanager.com/gtag/js?id=UA-122229484-1"></script>
             <script>
diff --git a/resources/views/portal/ninja2020/layout/clean.blade.php b/resources/views/portal/ninja2020/layout/clean.blade.php
index 64bb385f588c..b8c49034cda2 100644
--- a/resources/views/portal/ninja2020/layout/clean.blade.php
+++ b/resources/views/portal/ninja2020/layout/clean.blade.php
@@ -3,7 +3,7 @@
 
     <head>
         <!-- Error: {{ session('error') }} -->
-         @if (config('services.analytics.matomo_url') && config('services.analytics.matomo_id'))
+         @if ($company && $company->matomo_url && $company->matomo_id)
             <script>
                 var _paq = window._paq = window._paq || [];
                 /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
@@ -11,14 +11,14 @@
                 _paq.push(['enableLinkTracking']);
                 _paq.push(['setUserId', '{{ auth()->guard('contact')->user()->company->present()->name }}']);
                 (function() {
-                var u="{{ config('services.analytics.matomo_url') }}";
+                var u="{{ $company->matomo_url }}";
                 _paq.push(['setTrackerUrl', u+'matomo.php']);
-                _paq.push(['setSiteId', '{{ config('services.analytics.matomo_id') }}']);
+                _paq.push(['setSiteId', '{{ $company->matomo_id }}']);
                 var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
                 g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
                 })();
             </script>
-            <noscript><p><img src="{{ config('services.analytics.matomo_url) }}/matomo.php?idsite={{ config('services.analytics.matomo_id') }}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
+            <noscript><p><img src="{{ $company->matomo_url }}/matomo.php?idsite={{ $company->matomo_id }}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
         @elseif (config('services.analytics.tracking_id'))
             <script async src="https://www.googletagmanager.com/gtag/js?id=UA-122229484-1"></script>
             <script>
diff --git a/resources/views/portal/ninja2020/layout/clean_setup.blade.php b/resources/views/portal/ninja2020/layout/clean_setup.blade.php
index 4623dbc6fab0..b734256dc646 100644
--- a/resources/views/portal/ninja2020/layout/clean_setup.blade.php
+++ b/resources/views/portal/ninja2020/layout/clean_setup.blade.php
@@ -3,7 +3,7 @@
 
     <head>
         <!-- Error: {{ session('error') }} -->
-         @if (config('services.analytics.matomo_url') && config('services.analytics.matomo_id'))
+         @if ($company && $company->matomo_url && $company->matomo_id)
             <script>
                 var _paq = window._paq = window._paq || [];
                 /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
@@ -11,14 +11,14 @@
                 _paq.push(['enableLinkTracking']);
                 _paq.push(['setUserId', '{{ auth()->guard('contact')->user()->company->present()->name }}']);
                 (function() {
-                var u="{{ config('services.analytics.matomo_url') }}";
+                var u="{{ $company->matomo_url }}";
                 _paq.push(['setTrackerUrl', u+'matomo.php']);
-                _paq.push(['setSiteId', '{{ config('services.analytics.matomo_id') }}']);
+                _paq.push(['setSiteId', '{{ $company->matomo_id }}']);
                 var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
                 g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
                 })();
             </script>
-            <noscript><p><img src="{{ config('services.analytics.matomo_url) }}/matomo.php?idsite={{ config('services.analytics.matomo_id') }}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
+            <noscript><p><img src="{{ $company->matomo_url }}/matomo.php?idsite={{ $company->matomo_id }}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
         @elif (config('services.analytics.tracking_id'))
             <script async src="https://www.googletagmanager.com/gtag/js?id=UA-122229484-1"></script>
             <script>
