diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/session/DefaultSessionFactoryLocator.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/session/DefaultSessionFactoryLocator.java
index 15bdd175f1..f425456278 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/session/DefaultSessionFactoryLocator.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/session/DefaultSessionFactoryLocator.java
@@ -89,7 +89,9 @@ public class DefaultSessionFactoryLocator<F> implements SessionFactoryLocator<F>
 
 	@Override
 	public SessionFactory<F> getSessionFactory(@Nullable Object key) {
-		return this.factories.getOrDefault(key, this.defaultFactory);
+		return key == null
+				? this.defaultFactory
+				: this.factories.getOrDefault(key, this.defaultFactory);
 	}
 
 }