diff --git a/CHANGELOG.md b/CHANGELOG.md
index b70400cae5..e0fcd4de7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,4 +10,4 @@
 ## Other  ?? Technical stuff, what happened behind the scene
 -->
 ## Fixes
-- Fixed NPE crash on tablets
+- Fixed more NPE crashes
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/storage/DiskUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/storage/DiskUtil.kt
index 016418593f..773657b431 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/storage/DiskUtil.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/storage/DiskUtil.kt
@@ -20,7 +20,7 @@ object DiskUtil {
     fun getDirectorySize(f: File): Long {
         var size: Long = 0
         if (f.isDirectory) {
-            for (file in f.listFiles()!!) {
+            for (file in f.listFiles().orEmpty()) {
                 size += getDirectorySize(file)
             }
         } else {