diff --git a/core/Filechecks.php b/core/Filechecks.php
index 56bf395acb03905ad53521aaeccac78fa8d94443..7a82db5b2be10952bdc537763a47422119d72ac2 100644
--- a/core/Filechecks.php
+++ b/core/Filechecks.php
@@ -43,7 +43,9 @@ class Filechecks
                 $directoryToCheck = PIWIK_USER_PATH . $directoryToCheck;
             }
 
-            $directoryToCheck = SettingsPiwik::rewriteTmpPathWithHostname($directoryToCheck);
+            if(strpos($directoryToCheck, '/tmp/') !== false) {
+                $directoryToCheck = SettingsPiwik::rewriteTmpPathWithHostname($directoryToCheck);
+            }
 
             Filesystem::mkdir($directoryToCheck);