diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservation.java
index 415eb0a88..298dfd8d0 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservation.java
@@ -16,7 +16,7 @@
 package org.springframework.data.mongodb.observability;
 
 import io.micrometer.common.docs.KeyName;
-import io.micrometer.observation.docs.DocumentedObservation;
+import io.micrometer.observation.docs.ObservationDocumentation;
 
 /**
  * A MongoDB-based {@link io.micrometer.observation.Observation}.
@@ -25,7 +25,7 @@ import io.micrometer.observation.docs.DocumentedObservation;
  * @author Greg Turnquist
  * @since 4.0.0
  */
-enum MongoObservation implements DocumentedObservation {
+enum MongoObservation implements ObservationDocumentation {
 
 	/**
 	 * Timer created around a MongoDB command execution.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservationCommandListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservationCommandListener.java
index e49170218..34d921efc 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservationCommandListener.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservationCommandListener.java
@@ -157,7 +157,7 @@ public final class MongoObservationCommandListener implements CommandListener {
 		MongoHandlerContext observationContext = new MongoHandlerContext(event, requestContext);
 
 		Observation observation = MongoObservation.MONGODB_COMMAND_OBSERVATION
-				.observation(this.observationRegistry, observationContext) //
+				.observation(this.observationRegistry, () -> observationContext) //
 				.contextualName(observationContext.getContextualName()) //
 				.observationConvention(this.observationConvention) //
 				.start();