diff --git a/Events.php b/Events.php
index a39a125..888f257 100644
--- a/Events.php
+++ b/Events.php
@@ -47,7 +47,7 @@ public static function onIntegrityCheck($event)
         $integrityController = $event->sender;
         $integrityController->showTestHeadline("CFile Module (" . File::find()->count() . " entries)");
 
-        foreach (File::find()->all() as $file) {
+        foreach (File::find()->each() as $file) {
             /* @var $file \humhub\modules\cfiles\models\File */
 
             // If parent_folder_id is 0 or null its an old root child which is not merged yet.
@@ -60,7 +60,7 @@ public static function onIntegrityCheck($event)
 
         $integrityController->showTestHeadline("CFile Module (" . File::find()->count() . " entries)");
 
-        foreach (Folder::find()->all() as $folder) {
+        foreach (Folder::find()->each() as $folder) {
             /* @var $file \humhub\modules\cfiles\models\File */
 
             // If parent_folder_id is 0 or null its either an old root child which is not merged yet or an root directory.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 0cf3330..9fa4a3d 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -5,6 +5,7 @@ Changelog
 -----------------------
 - Enh #194: Tests for `next` version
 - Fix #197: Fix visibility of the method `Controller::getAccessRules()`
+- Fix #198: Fix memory usage on integrity check
 
 0.16.2 - September 4, 2023
 ---------------------------