diff --git a/CHANGELOG.md b/CHANGELOG.md
index bacedc465..00e7a2a59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix bug where flood playout mode would only schedule one item
   - This would happen if the flood was followed by another flood with a fixed start time
 
+### Added
+- Support empty `.etvignore` file to instruct local movie scanner to ignore the containing folder
+
 ## [0.2.2-alpha] - 2021-10-30
 ### Fixed
 - Fix EPG entries for Duration schedule items that play multiple items
diff --git a/ErsatzTV.Core/Metadata/MovieFolderScanner.cs b/ErsatzTV.Core/Metadata/MovieFolderScanner.cs
index e7f0266d2..547589b9c 100644
--- a/ErsatzTV.Core/Metadata/MovieFolderScanner.cs
+++ b/ErsatzTV.Core/Metadata/MovieFolderScanner.cs
@@ -69,7 +69,9 @@ namespace ErsatzTV.Core.Metadata
             var foldersCompleted = 0;
 
             var folderQueue = new Queue<string>();
-            foreach (string folder in _localFileSystem.ListSubdirectories(libraryPath.Path).OrderBy(identity))
+            foreach (string folder in _localFileSystem.ListSubdirectories(libraryPath.Path)
+                .Filter(ShouldIncludeFolder)
+                .OrderBy(identity))
             {
                 folderQueue.Enqueue(folder);
             }
@@ -95,7 +97,9 @@ namespace ErsatzTV.Core.Metadata
 
                 if (allFiles.Count == 0)
                 {
-                    foreach (string subdirectory in _localFileSystem.ListSubdirectories(movieFolder).OrderBy(identity))
+                    foreach (string subdirectory in _localFileSystem.ListSubdirectories(movieFolder)
+                        .Filter(ShouldIncludeFolder)
+                        .OrderBy(identity))
                     {
                         folderQueue.Enqueue(subdirectory);
                     }