diff --git a/lib/Controller/AlbumsController.php b/lib/Controller/AlbumsController.php
index 4a475dca6..678ea0a7e 100644
--- a/lib/Controller/AlbumsController.php
+++ b/lib/Controller/AlbumsController.php
@@ -142,6 +142,11 @@ private function scanFolder(Folder $folder, int $depth, bool $shared): iterable
 			return [];
 		}
 
+		// Ignore folder with a .noimage or .nomedia node
+		if ($folder->nodeExists('.noimage') || $folder->nodeExists('.nomedia')) {
+			return [];
+		}
+
 		$nodes = $folder->getDirectoryListing();
 
 		foreach ($nodes as $node) {