diff --git a/phpBB/includes/extension/finder.php b/phpBB/includes/extension/finder.php
index a1e6b2b347..11eb682f46 100644
--- a/phpBB/includes/extension/finder.php
+++ b/phpBB/includes/extension/finder.php
@@ -377,9 +377,14 @@ class phpbb_extension_finder
 			}
 			$directory_pattern = '#' . $directory_pattern . '#';
 
-			$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS), RecursiveIteratorIterator::SELF_FIRST);
+			$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST);
 			foreach ($iterator as $file_info)
 			{
+				if (in_array($file_info, array('.', '..')))
+				{
+					continue;
+				}
+
 				if ($file_info->isDir() == $is_dir)
 				{
 					if ($is_dir)