diff --git a/main/document/downloadfolder.inc.php b/main/document/downloadfolder.inc.php
index 7b5cfd005d..d615aedd7d 100755
--- a/main/document/downloadfolder.inc.php
+++ b/main/document/downloadfolder.inc.php
@@ -102,7 +102,11 @@ function fixDocumentNameCallback($p_event, &$p_header)
         $documentNameFixed
     );
 
-    $documentNameFixed = str_replace($remove_dir, '/', $documentNameFixed);
+    if ($remove_dir != '/') {
+        $documentNameFixed = str_replace($remove_dir, '/', $documentNameFixed);
+    } else {
+        $documentNameFixed = ltrim($documentNameFixed, '/');
+    }
     $p_header['stored_filename'] = $documentNameFixed;
 
     return 1;