diff --git a/system/includes/functions.php b/system/includes/functions.php
index 911cec3..64e775e 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -2030,6 +2030,11 @@ function matomo($title)
     $matomoID       = config('matomo.id');
     $matomoTracking = config('matomo.tracking');
     
+    if($matomoTracking == 'disable')
+    {
+        return;
+    }
+    
     if(empty($matomoURL) || empty($matomoTracking) || empty($matomoID) || empty($matomoToken))
     {
         error_log("Please set all Matomo configuration values", 0);
@@ -2072,10 +2077,6 @@ EOF;
         // Track page view
         $matomoTracker->doTrackPageView($title);
     }
-    else 
-    {
-        return "nothing";
-    }
 }
 
 function slashUrl($url) {