diff --git a/src/main/scala/Commands.scala b/src/main/scala/Commands.scala
index 6ee8365..a4e7f75 100644
--- a/src/main/scala/Commands.scala
+++ b/src/main/scala/Commands.scala
@@ -649,8 +649,7 @@ object Commands {
     )
 
   def onPaymentSucceeded(
-      data: OutgoingPaymentSenderData,
-      fulfill: RemoteFulfill
+      data: OutgoingPaymentSenderData
   ): JSONRPCNotification = {
     val msatoshi =
       data.inFlightParts
@@ -664,7 +663,7 @@ object Commands {
         ("payment_hash" -> data.cmd.fullTag.paymentHash.toHex) ~~
         ("fee_msatoshi" -> data.usedFee.toLong) ~~
         ("msatoshi" -> msatoshi) ~~
-        ("preimage" -> fulfill.theirPreimage.toHex) ~~
+        ("preimage" -> data.preimage.get.toHex) ~~
         ("routes" -> data.inFlightParts.map(_.route.asString)) ~~
         ("parts" -> data.parts.size)
         // @formatter:on
diff --git a/src/main/scala/Main.scala b/src/main/scala/Main.scala
index 782ee11..f7296b7 100644
--- a/src/main/scala/Main.scala
+++ b/src/main/scala/Main.scala
@@ -377,13 +377,12 @@ object Main extends IOApp.Simple {
                   topic.publish1(Commands.onPaymentFailed(data)) >> IO.unit
                 )
 
-              override def gotFirstPreimage(
-                  data: OutgoingPaymentSenderData,
-                  fulfill: RemoteFulfill
+              override def wholePaymentSucceeded(
+                  data: OutgoingPaymentSenderData
               ): Unit =
                 dispatcher.unsafeRunAndForget(
                   topic.publish1(
-                    Commands.onPaymentSucceeded(data, fulfill)
+                    Commands.onPaymentSucceeded(data)
                   ) >> IO.unit
                 )
             }