diff --git a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/config/AdminServerAutoConfiguration.java b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/config/AdminServerAutoConfiguration.java
index 1739db2fd7a..39febfd230a 100644
--- a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/config/AdminServerAutoConfiguration.java
+++ b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/config/AdminServerAutoConfiguration.java
@@ -100,7 +100,8 @@ public InstanceIdGenerator instanceIdGenerator() {
 	@ConditionalOnMissingBean
 	public StatusUpdater statusUpdater(InstanceRepository instanceRepository,
 			InstanceWebClient.Builder instanceWebClientBuilder) {
-		return new StatusUpdater(instanceRepository, instanceWebClientBuilder.build(), new ApiMediaTypeHandler());
+		return new StatusUpdater(instanceRepository, instanceWebClientBuilder.build(), new ApiMediaTypeHandler())
+			.timeout(this.adminServerProperties.getMonitor().getDefaultTimeout());
 	}
 
 	@Bean(initMethod = "start", destroyMethod = "stop")
diff --git a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/services/StatusUpdateTrigger.java b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/services/StatusUpdateTrigger.java
index 80470f96957..0906f7a5948 100644
--- a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/services/StatusUpdateTrigger.java
+++ b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/services/StatusUpdateTrigger.java
@@ -54,13 +54,10 @@ protected Publisher<Void> handle(Flux<InstanceEvent> publisher) {
 	}
 
 	protected Mono<Void> updateStatus(InstanceId instanceId) {
-		return this.statusUpdater.timeout(this.intervalCheck.getInterval())
-			.updateStatus(instanceId)
-			.onErrorResume((e) -> {
-				log.warn("Unexpected error while updating status for {}", instanceId, e);
-				return Mono.empty();
-			})
-			.doFinally((s) -> this.intervalCheck.markAsChecked(instanceId));
+		return this.statusUpdater.updateStatus(instanceId).onErrorResume((e) -> {
+			log.warn("Unexpected error while updating status for {}", instanceId, e);
+			return Mono.empty();
+		}).doFinally((s) -> this.intervalCheck.markAsChecked(instanceId));
 	}
 
 	@Override
diff --git a/spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/services/StatusUpdateTriggerTest.java b/spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/services/StatusUpdateTriggerTest.java
index e1899409f20..f6432a7550e 100644
--- a/spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/services/StatusUpdateTriggerTest.java
+++ b/spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/services/StatusUpdateTriggerTest.java
@@ -56,7 +56,6 @@ class StatusUpdateTriggerTest {
 	@BeforeEach
 	void setUp() {
 		when(this.updater.updateStatus(any(InstanceId.class))).thenReturn(Mono.empty());
-		when(this.updater.timeout(any())).thenReturn(this.updater);
 
 		this.trigger = new StatusUpdateTrigger(this.updater, this.events.flux(), Duration.ofSeconds(10),
 				Duration.ofSeconds(10), Duration.ofSeconds(60));