diff --git a/src/main/java/org/elasticsearch/index/store/fs/DefaultFsDirectoryService.java b/src/main/java/org/elasticsearch/index/store/fs/DefaultFsDirectoryService.java
index 2f67e91ec1a..aedf668f167 100644
--- a/src/main/java/org/elasticsearch/index/store/fs/DefaultFsDirectoryService.java
+++ b/src/main/java/org/elasticsearch/index/store/fs/DefaultFsDirectoryService.java
@@ -50,6 +50,13 @@ public class DefaultFsDirectoryService extends FsDirectoryService {
 
     @Override
     protected Directory newFSDirectory(Path location, LockFactory lockFactory) throws IOException {
-        return new FileSwitchDirectory(PRIMARY_EXTENSIONS, new MMapDirectory(location, lockFactory), new NIOFSDirectory(location, lockFactory), true);
+        final MMapDirectory mmapDir = new MMapDirectory(location, lockFactory);
+        return new FileSwitchDirectory(PRIMARY_EXTENSIONS, mmapDir, new NIOFSDirectory(location, lockFactory), true) {
+            @Override
+            public String[] listAll() throws IOException {
+                // Avoid doing listAll twice:
+                return mmapDir.listAll();
+            }
+        };
     }
 }