diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/FileSystemScanner.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/FileSystemScanner.kt
index f2cc19757..42d235e8d 100644
--- a/komga/src/main/kotlin/org/gotson/komga/domain/service/FileSystemScanner.kt
+++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/FileSystemScanner.kt
@@ -72,14 +72,14 @@ class FileSystemScanner(
         object : FileVisitor<Path> {
           override fun preVisitDirectory(dir: Path, attrs: BasicFileAttributes): FileVisitResult {
             logger.trace { "preVisit: $dir" }
-            if (dir.fileName.toString().startsWith(".") ||
+            if (dir.fileName?.toString()?.startsWith(".") == true ||
               komgaProperties.librariesScanDirectoryExclusions.any { exclude ->
                 dir.toString().contains(exclude, true)
               }
             ) return FileVisitResult.SKIP_SUBTREE
 
             pathToSeries[dir] = Series(
-              name = dir.fileName.toString(),
+              name = dir.fileName?.toString() ?: dir.toString(),
               url = dir.toUri().toURL(),
               fileLastModified = attrs.getUpdatedTime()
             )
diff --git a/komga/src/test/kotlin/org/gotson/komga/domain/service/FileSystemScannerTest.kt b/komga/src/test/kotlin/org/gotson/komga/domain/service/FileSystemScannerTest.kt
index c9bfce58d..5140be9a8 100644
--- a/komga/src/test/kotlin/org/gotson/komga/domain/service/FileSystemScannerTest.kt
+++ b/komga/src/test/kotlin/org/gotson/komga/domain/service/FileSystemScannerTest.kt
@@ -70,6 +70,28 @@ class FileSystemScannerTest {
     }
   }
 
+  @Test
+  fun `given root directory as filesystem root when scanning then return 1 series containing those files as books`() {
+    Jimfs.newFileSystem(Configuration.unix()).use { fs ->
+      // given
+      val root = fs.getPath("/")
+
+      val files = listOf("file1.cbz", "file2.cbz")
+      files.forEach { Files.createFile(root.resolve(it)) }
+
+      // when
+      val scan = scanner.scanRootFolder(root).series
+      val series = scan.keys.first()
+      val books = scan.getValue(series)
+
+      // then
+      assertThat(scan).hasSize(1)
+      assertThat(series.name).isEqualTo("/")
+      assertThat(books).hasSize(2)
+      assertThat(books.map { it.name }).containsExactlyInAnyOrderElementsOf(files.map { FilenameUtils.removeExtension(it) })
+    }
+  }
+
   @Test
   fun `given directory with unsupported files when scanning then return a series excluding those files as books`() {
     Jimfs.newFileSystem(Configuration.unix()).use { fs ->