diff --git a/akka-projection-durable-state/src/main/scala/akka/projection/state/javadsl/DurableStateSourceProvider.scala b/akka-projection-durable-state/src/main/scala/akka/projection/state/javadsl/DurableStateSourceProvider.scala
index c726495cf..ca918c615 100644
--- a/akka-projection-durable-state/src/main/scala/akka/projection/state/javadsl/DurableStateSourceProvider.scala
+++ b/akka-projection-durable-state/src/main/scala/akka/projection/state/javadsl/DurableStateSourceProvider.scala
@@ -16,6 +16,7 @@ import akka.NotUsed
 import akka.actor.typed.ActorSystem
 import akka.annotation.InternalApi
 import akka.japi.Pair
+import akka.persistence.query.DeletedDurableState
 import akka.persistence.query.NoOffset
 import akka.persistence.query.Offset
 import akka.persistence.query.DurableStateChange
@@ -74,7 +75,7 @@ object DurableStateSourceProvider {
     override def extractCreationTime(stateChange: DurableStateChange[A]): Long =
       stateChange match {
         case u: UpdatedDurableState[_] => u.timestamp
-        case _                         => 0L // FIXME handle DeletedDurableState when that is added
+        case d: DeletedDurableState[_] => d.timestamp
       }
   }
 
@@ -141,10 +142,7 @@ object DurableStateSourceProvider {
     override def extractCreationTime(stateChange: DurableStateChange[A]): Long =
       stateChange match {
         case u: UpdatedDurableState[_] => u.timestamp
-        case other                     =>
-          // FIXME case DeletedDurableState when that is added
-          throw new IllegalArgumentException(
-            s"DurableStateChange [${other.getClass.getName}] not implemented yet. Please report bug at https://github.com/akka/akka-persistence-r2dbc/issues")
+        case d: DeletedDurableState[_] => d.timestamp
       }
 
     override def getObject(persistenceId: String): CompletionStage[GetObjectResult[A]] =
diff --git a/akka-projection-durable-state/src/main/scala/akka/projection/state/scaladsl/DurableStateSourceProvider.scala b/akka-projection-durable-state/src/main/scala/akka/projection/state/scaladsl/DurableStateSourceProvider.scala
index f54fe9764..fbf7b16c0 100644
--- a/akka-projection-durable-state/src/main/scala/akka/projection/state/scaladsl/DurableStateSourceProvider.scala
+++ b/akka-projection-durable-state/src/main/scala/akka/projection/state/scaladsl/DurableStateSourceProvider.scala
@@ -10,6 +10,7 @@ import scala.concurrent.Future
 
 import akka.NotUsed
 import akka.actor.typed.ActorSystem
+import akka.persistence.query.DeletedDurableState
 import akka.persistence.query.NoOffset
 import akka.persistence.query.Offset
 import akka.persistence.query.DurableStateChange
@@ -64,7 +65,7 @@ object DurableStateSourceProvider {
     override def extractCreationTime(stateChange: DurableStateChange[A]): Long =
       stateChange match {
         case u: UpdatedDurableState[_] => u.timestamp
-        case _                         => 0L // FIXME handle DeletedDurableState when that is added
+        case d: DeletedDurableState[_] => d.timestamp
       }
   }
 
@@ -129,10 +130,7 @@ object DurableStateSourceProvider {
     override def extractCreationTime(stateChange: DurableStateChange[A]): Long =
       stateChange match {
         case u: UpdatedDurableState[_] => u.timestamp
-        case other                     =>
-          // FIXME case DeletedDurableState when that is added
-          throw new IllegalArgumentException(
-            s"DurableStateChange [${other.getClass.getName}] not implemented yet. Please report bug at https://github.com/akka/akka-persistence-r2dbc/issues")
+        case d: DeletedDurableState[_] => d.timestamp
       }
 
     override def getObject(persistenceId: String): Future[GetObjectResult[A]] =