diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java
index 7e934fe5e..d705ade10 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java
@@ -56,11 +56,9 @@ public class DefaultFileManagerFactory implements FileManagerFactory {
         if (LOG.isDebugEnabled()) {
             LOG.debug("No user defined FileManager, looking up for internal implementations!");
         }
-        if (fileManager == null) {
-            for (FileManager fm : internals) {
-                if (fm.support()) {
-                    return fm;
-                }
+        for (FileManager fm : internals) {
+            if (fm.support()) {
+                return fm;
             }
         }
         if (LOG.isDebugEnabled()) {
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java
index bf061d75e..0868709b6 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java
@@ -35,6 +35,7 @@ public class DefaultFileManagerFactoryTest extends XWorkTestCase {
         // given
         fileManager = new DummyFileManager();
         DefaultFileManagerFactory factory = new DefaultFileManagerFactory();
+        factory.setFileManager(new DefaultFileManager());
         factory.setContainer(new DummyContainer());
 
         // when