diff --git a/lib/api/api.go b/lib/api/api.go
index 5e41badb6..38b5d2c92 100644
--- a/lib/api/api.go
+++ b/lib/api/api.go
@@ -1865,13 +1865,7 @@ func (v jsonVersionVector) MarshalJSON() ([]byte, error) {
 }
 
 func dirNames(dir string) []string {
-	fd, err := os.Open(dir)
-	if err != nil {
-		return nil
-	}
-	defer fd.Close()
-
-	fis, err := fd.Readdir(-1)
+	fis, err := os.ReadDir(dir)
 	if err != nil {
 		return nil
 	}
diff --git a/lib/db/backend/leveldb_open.go b/lib/db/backend/leveldb_open.go
index 1f5f14acd..32a5585df 100644
--- a/lib/db/backend/leveldb_open.go
+++ b/lib/db/backend/leveldb_open.go
@@ -200,22 +200,21 @@ func dbIsLarge(location string) bool {
 		return false
 	}
 
-	dir, err := os.Open(location)
-	if err != nil {
-		return false
-	}
-
-	fis, err := dir.Readdir(-1)
+	entries, err := os.ReadDir(location)
 	if err != nil {
 		return false
 	}
 
 	var size int64
-	for _, fi := range fis {
-		if fi.Name() == "LOG" {
+	for _, entry := range entries {
+		if entry.Name() == "LOG" {
 			// don't count the size
 			continue
 		}
+		fi, err := entry.Info()
+		if err != nil {
+			continue
+		}
 		size += fi.Size()
 	}