diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf
index c0b253f9..fb6ec574 100644
--- a/core/src/main/resources/reference.conf
+++ b/core/src/main/resources/reference.conf
@@ -371,8 +371,8 @@ akka.persistence.r2dbc {
   # Ignored for H2
   db-timestamp-monotonic-increasing = off
 
-  # Enable this for testing or workaround of https://github.com/yugabyte/yugabyte-db/issues/10995
-  # FIXME: This property will be removed when the Yugabyte issue has been resolved.
+  # Enable this to generate timestamps from the Akka client side instead of using database timestamps.
+  # NTP or similar clock synchronization should be used, but some clock skew between clients is accepted.
   # Ignored for H2
   use-app-timestamp = off
 
diff --git a/core/src/main/scala/akka/persistence/r2dbc/R2dbcSettings.scala b/core/src/main/scala/akka/persistence/r2dbc/R2dbcSettings.scala
index 179740f9..80d1185c 100644
--- a/core/src/main/scala/akka/persistence/r2dbc/R2dbcSettings.scala
+++ b/core/src/main/scala/akka/persistence/r2dbc/R2dbcSettings.scala
@@ -87,7 +87,6 @@ object R2dbcSettings {
 
     val dbTimestampMonotonicIncreasing: Boolean = config.getBoolean("db-timestamp-monotonic-increasing")
 
-    // FIXME remove when https://github.com/yugabyte/yugabyte-db/issues/10995 has been resolved
     val useAppTimestamp: Boolean = config.getBoolean("use-app-timestamp")
 
     val logDbCallsExceeding: FiniteDuration =