diff --git a/src/event.rs b/src/event.rs
index 1baef41e3..fbeb11aec 100644
--- a/src/event.rs
+++ b/src/event.rs
@@ -1137,21 +1137,6 @@ where
 				claim_from_onchain_tx,
 				outbound_amount_forwarded_msat,
 			} => {
-				let event = Event::PaymentForwarded {
-					prev_channel_id: prev_channel_id.expect("prev_channel_id expected for events generated by LDK versions greater than 0.0.107."),
-					next_channel_id: next_channel_id.expect("next_channel_id expected for events generated by LDK versions greater than 0.0.107."),
-					prev_user_channel_id: prev_user_channel_id.map(UserChannelId),
-					next_user_channel_id: next_user_channel_id.map(UserChannelId),
-					total_fee_earned_msat,
-					skimmed_fee_msat,
-					claim_from_onchain_tx,
-					outbound_amount_forwarded_msat,
-				};
-				self.event_queue.add_event(event).map_err(|e| {
-					log_error!(self.logger, "Failed to push to event queue: {}", e);
-					ReplayEvent()
-				})?;
-
 				let read_only_network_graph = self.network_graph.read_only();
 				let nodes = read_only_network_graph.nodes();
 				let channels = self.channel_manager.list_channels();
@@ -1184,14 +1169,13 @@ where
 					format!(" to {}{}", node_str(&next_channel_id), channel_str(&next_channel_id));
 
 				let fee_earned = total_fee_earned_msat.unwrap_or(0);
-				let outbound_amount_forwarded_msat = outbound_amount_forwarded_msat.unwrap_or(0);
 				if claim_from_onchain_tx {
 					log_info!(
 						self.logger,
 						"Forwarded payment{}{} of {}msat, earning {}msat in fees from claiming onchain.",
 						from_prev_str,
 						to_next_str,
-						outbound_amount_forwarded_msat,
+						outbound_amount_forwarded_msat.unwrap_or(0),
 						fee_earned,
 					);
 				} else {
@@ -1200,7 +1184,7 @@ where
 						"Forwarded payment{}{} of {}msat, earning {}msat in fees.",
 						from_prev_str,
 						to_next_str,
-						outbound_amount_forwarded_msat,
+						outbound_amount_forwarded_msat.unwrap_or(0),
 						fee_earned,
 					);
 				}
@@ -1208,6 +1192,21 @@ where
 				if let Some(liquidity_source) = self.liquidity_source.as_ref() {
 					liquidity_source.handle_payment_forwarded(next_channel_id);
 				}
+
+				let event = Event::PaymentForwarded {
+					prev_channel_id: prev_channel_id.expect("prev_channel_id expected for events generated by LDK versions greater than 0.0.107."),
+					next_channel_id: next_channel_id.expect("next_channel_id expected for events generated by LDK versions greater than 0.0.107."),
+					prev_user_channel_id: prev_user_channel_id.map(UserChannelId),
+					next_user_channel_id: next_user_channel_id.map(UserChannelId),
+					total_fee_earned_msat,
+					skimmed_fee_msat,
+					claim_from_onchain_tx,
+					outbound_amount_forwarded_msat,
+				};
+				self.event_queue.add_event(event).map_err(|e| {
+					log_error!(self.logger, "Failed to push to event queue: {}", e);
+					ReplayEvent()
+				})?;
 			},
 			LdkEvent::ChannelPending {
 				channel_id,