1 files changed, 1 insertions, 6 deletions
diff --git a/core/Common.php b/core/Common.php
index 5d5c35c764..c345c1d17d 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -1053,12 +1053,7 @@ class Common
     public static function sendHeader($header, $replace = true)
     {
         // don't send header in CLI mode
-        if(Common::isPhpCliMode()) {
-            return;
-        }
-        if (isset($GLOBALS['PIWIK_TRACKER_LOCAL_TRACKING']) && $GLOBALS['PIWIK_TRACKER_LOCAL_TRACKING']) {
-            @header($header, $replace);
-        } else {
+        if(!Common::isPhpCliMode() and !headers_sent()) {
             header($header, $replace);
         }
     }