diff --git a/lib/Command/MigrateGoogleTakeout.php b/lib/Command/MigrateGoogleTakeout.php
index d3ebd6156..7860da13a 100644
--- a/lib/Command/MigrateGoogleTakeout.php
+++ b/lib/Command/MigrateGoogleTakeout.php
@@ -153,7 +153,7 @@ protected function migrateUser(IUser $user): void
     protected function migrateFolder(Folder $folder): void
     {
         // Check for .nomedia
-        if ($folder->nodeExists('.nomedia') || $folder->nodeExists('.nomemories')) {
+        if ($folder->nodeExists('.nomedia') || $folder->nodeExists('.noimage') || $folder->nodeExists('.nomemories')) {
             return;
         }
 
diff --git a/lib/Db/FsManager.php b/lib/Db/FsManager.php
index 2cff95ac5..0454807ed 100644
--- a/lib/Db/FsManager.php
+++ b/lib/Db/FsManager.php
@@ -180,6 +180,7 @@ public function getNoMediaFolders(Folder $root, string $key): array
 
         $comp = new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_OR, [
             new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'name', '.nomedia'),
+            new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'name', '.noimage'),
             new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'name', '.nomemories'),
         ]);
         $search = $root->search(new SearchQuery($comp, 0, 0, [], Util::getUser()));
diff --git a/lib/Db/TimelineQueryCTE.php b/lib/Db/TimelineQueryCTE.php
index b9ae739ad..bc0fcdc9d 100644
--- a/lib/Db/TimelineQueryCTE.php
+++ b/lib/Db/TimelineQueryCTE.php
@@ -28,7 +28,7 @@ protected function CTE_FOLDERS_ALL(bool $hidden): string
         // Select 1 if there is a .nomedia file in the folder
         $SEL_NOMEDIA = "SELECT 1 FROM *PREFIX*filecache f2
             WHERE (f2.parent = f.fileid)
-            AND (f2.name = '.nomedia' OR f2.name = '.nomemories')";
+            AND (f2.name = '.nomedia' OR f2.name = '.noimage' OR f2.name = '.nomemories')";
 
         // Check no nomedia file exists in the folder
         $CLS_NOMEDIA = "NOT EXISTS ({$SEL_NOMEDIA})";
diff --git a/lib/Listeners/PostWriteListener.php b/lib/Listeners/PostWriteListener.php
index 6bd935320..0c8b3c2a6 100644
--- a/lib/Listeners/PostWriteListener.php
+++ b/lib/Listeners/PostWriteListener.php
@@ -60,7 +60,7 @@ public function handle(Event $event): void
 
             /** @psalm-suppress RedundantConditionGivenDocblockType */
             while ($parent = $parent->getParent()) {
-                if ($parent->nodeExists('.nomedia') || $parent->nodeExists('.nomemories')) {
+                if ($parent->nodeExists('.nomedia') || $parent->nodeExists('.noimage') || $parent->nodeExists('.nomemories')) {
                     return;
                 }
             }
diff --git a/lib/Service/Index.php b/lib/Service/Index.php
index 58f8702f4..c8f96df1b 100644
--- a/lib/Service/Index.php
+++ b/lib/Service/Index.php
@@ -118,8 +118,8 @@ public function indexFolder(Folder $folder): void
         $path = $folder->getPath();
         $this->log("Indexing folder {$path}", true);
 
-        if ($folder->nodeExists('.nomedia') || $folder->nodeExists('.nomemories')) {
-            $this->log("Skipping folder {$path} (.nomedia / .nomemories)".PHP_EOL, true);
+        if ($folder->nodeExists('.nomedia') || $folder->nodeExists('.noimage') || $folder->nodeExists('.nomemories')) {
+            $this->log("Skipping folder {$path}".PHP_EOL, true);
 
             return;
         }