diff --git a/repository/filesystem/lib.php b/repository/filesystem/lib.php
index 432e79d4374..e911d6704be 100644
--- a/repository/filesystem/lib.php
+++ b/repository/filesystem/lib.php
@@ -48,9 +48,14 @@ class repository_filesystem extends repository {
     public function __construct($repositoryid, $context = SYSCONTEXTID, $options = array()) {
         global $CFG;
         parent::__construct($repositoryid, $context, $options);
-        $root = $CFG->dataroot.'/repository/';
+        $root = $CFG->dataroot . '/repository/';
         $subdir = $this->get_option('fs_path');
-        $this->root_path = $root . $subdir . '/';
+
+        $this->root_path = $root;
+        if (!empty($subdir)) {
+            $this->root_path .= $subdir . '/';
+        }
+
         if (!empty($options['ajax'])) {
             if (!is_dir($this->root_path)) {
                 $created = mkdir($this->root_path, $CFG->directorypermissions, true);