diff --git a/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java b/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
index 315089ed9..32049f65a 100644
--- a/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
+++ b/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
@@ -1588,6 +1588,7 @@ <T> Stream<T> searchForStream(LdapQuery query, Function<SearchResult, T> mapper)
 			return ctx.search(base, encodedFilter, searchControls);
 		});
 		if (results == null) {
+			closeContextAndNamingEnumeration(ctx, null);
 			return Stream.empty();
 		}
 		return StreamSupport