diff --git a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventPublicationConfiguration.java b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventPublicationConfiguration.java
index c2f4fb44..543d829b 100644
--- a/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventPublicationConfiguration.java
+++ b/spring-modulith-events/spring-modulith-events-core/src/main/java/org/springframework/modulith/events/config/EventPublicationConfiguration.java
@@ -113,8 +113,7 @@ class EventPublicationConfiguration {
 		private boolean anyPropertyConfigured(String... properties) {
 
 			return Arrays.stream(properties)
-					.map(it -> environment.containsProperty(it))
-					.anyMatch(it -> it != null);
+					.anyMatch(it -> environment.containsProperty(it));
 		}
 	}
 }
diff --git a/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/config/EventPublicationConfigurationIntegrationTests.java b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/config/EventPublicationConfigurationIntegrationTests.java
index 91b86c69..e17c76db 100644
--- a/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/config/EventPublicationConfigurationIntegrationTests.java
+++ b/spring-modulith-events/spring-modulith-events-core/src/test/java/org/springframework/modulith/events/config/EventPublicationConfigurationIntegrationTests.java
@@ -48,7 +48,13 @@ class EventPublicationConfigurationIntegrationTests {
 	void registersAsyncTerminationDefaulterByDefault() {
 
 		basicSetup()
-				.run(context -> assertThat(context).hasSingleBean(AsyncPropertiesDefaulter.class));
+				.run(context -> {
+					assertThat(context).hasSingleBean(AsyncPropertiesDefaulter.class);
+
+					expect(Shutdown::isAwaitTermination, true).andThen(
+							expect(Shutdown::getAwaitTerminationPeriod, Duration.ofSeconds(2)))
+							.accept(context);
+				});
 	}
 
 	@Test // GH-149
@@ -63,7 +69,6 @@ class EventPublicationConfigurationIntegrationTests {
 	void doesNotApplyDefaultingIfShutdownTerminationPropertyConfigured() {
 
 		basicSetup()
-				.withConfiguration(AutoConfigurations.of(TaskExecutionAutoConfiguration.class))
 				.withPropertyValues("spring.task.execution.shutdown.await-termination=false")
 				.run(expect(Shutdown::isAwaitTermination, false));
 	}
@@ -72,7 +77,6 @@ class EventPublicationConfigurationIntegrationTests {
 	void doesNotApplyDefaultingIfShutdownTerminationPeriodPropertyConfigured() {
 
 		basicSetup()
-				.withConfiguration(AutoConfigurations.of(TaskExecutionAutoConfiguration.class))
 				.withPropertyValues("spring.task.execution.shutdown.await-termination-period=10m")
 				.run(expect(Shutdown::getAwaitTerminationPeriod, Duration.ofMinutes(10)));
 	}
@@ -88,7 +92,8 @@ class EventPublicationConfigurationIntegrationTests {
 	private ApplicationContextRunner basicSetup() {
 
 		return new ApplicationContextRunner()
-				.withConfiguration(AutoConfigurations.of(EventPublicationConfiguration.class))
+				.withConfiguration(
+						AutoConfigurations.of(EventPublicationConfiguration.class, TaskExecutionAutoConfiguration.class))
 				.withBean(EventPublicationRepository.class, () -> repository);
 	}
 }