diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53dcfc3408..7b540f80db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,12 +15,14 @@
 
 ## Changes
 - Enable 'Split Tall Images' by default (@Smol-Ame)
+- Minor visual adjustments
 
 ## Fixes
 - Fixed only few DoH provider is actually being used (Cloudflare, Google, AdGuard, and Quad9)
 - Fixed "Group by Ungrouped" showing duplicate entries
 - Fixed reader sometimes won't load images
 - Handle some uncaught crashes
+- Fixed potential NPE crashes
 
 ## Other
 - Simplify network helper code
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 {