diff --git a/bitcoin/tx.c b/bitcoin/tx.c
index bb9aa3bd8..869bc6897 100644
--- a/bitcoin/tx.c
+++ b/bitcoin/tx.c
@@ -548,9 +548,13 @@ void bitcoin_tx_finalize(struct bitcoin_tx *tx)
 	assert(bitcoin_tx_check(tx));
 }
 
-struct bitcoin_tx *bitcoin_tx_with_psbt(const tal_t *ctx, struct wally_psbt *psbt STEALS)
+struct bitcoin_tx *bitcoin_tx_with_psbt(const tal_t *ctx, struct wally_psbt *psbt TAKES)
 {
 	size_t locktime;
+
+	if (!taken(psbt))
+		psbt = clone_psbt(NULL, psbt);
+
 	wally_psbt_get_locktime(psbt, &locktime);
 	struct bitcoin_tx *tx = bitcoin_tx(ctx, chainparams,
 					   psbt->num_inputs,
diff --git a/bitcoin/tx.h b/bitcoin/tx.h
index fc6844035..2549cd5e2 100644
--- a/bitcoin/tx.h
+++ b/bitcoin/tx.h
@@ -111,7 +111,8 @@ bool bitcoin_txid_to_hex(const struct bitcoin_txid *txid,
 			 char *hexstr, size_t hexstr_len);
 
 /* Create a bitcoin_tx from a psbt */
-struct bitcoin_tx *bitcoin_tx_with_psbt(const tal_t *ctx, struct wally_psbt *psbt);
+struct bitcoin_tx *bitcoin_tx_with_psbt(const tal_t *ctx,
+					struct wally_psbt *psbt TAKES);
 
 /* Internal de-linearization functions. */
 /* Pull a bitcoin tx, and create a PSBT wrapper for it */
diff --git a/db/bindings.c b/db/bindings.c
index e8b83785b..9107bc5c2 100644
--- a/db/bindings.c
+++ b/db/bindings.c
@@ -501,7 +501,7 @@ struct bitcoin_tx *db_col_psbt_to_tx(const tal_t *ctx, struct db_stmt *stmt, con
 	struct wally_psbt *psbt = db_col_psbt(ctx, stmt, colname);
 	if (!psbt)
 		return NULL;
-	return bitcoin_tx_with_psbt(ctx, psbt);
+	return bitcoin_tx_with_psbt(ctx, take(psbt));
 }
 
 struct channel_type *db_col_channel_type(const tal_t *ctx, struct db_stmt *stmt,
diff --git a/lightningd/channel.c b/lightningd/channel.c
index 2a25d36a1..94ff06c7b 100644
--- a/lightningd/channel.c
+++ b/lightningd/channel.c
@@ -220,12 +220,10 @@ void inflight_set_last_tx(struct channel_inflight *inflight,
 		          struct bitcoin_tx *last_tx,
 		          const struct bitcoin_signature last_sig)
 {
-	struct wally_psbt *last_tx_psbt_clone;
 	assert(inflight->last_tx == NULL);
 	assert(last_tx);
 
-	last_tx_psbt_clone = clone_psbt(inflight, last_tx->psbt);
-	inflight->last_tx = bitcoin_tx_with_psbt(inflight, last_tx_psbt_clone);
+	inflight->last_tx = bitcoin_tx_with_psbt(inflight, last_tx->psbt);
 	inflight->last_sig = last_sig;
 }
 
diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c
index 129bd8cdf..c5cabc917 100644
--- a/lightningd/peer_control.c
+++ b/lightningd/peer_control.c
@@ -2131,8 +2131,6 @@ void update_channel_from_inflight(struct lightningd *ld,
 				  struct channel *channel,
 				  const struct channel_inflight *inflight)
 {
-	struct wally_psbt *psbt_copy;
-
 	channel->funding = inflight->funding->outpoint;
 	channel->funding_sats = inflight->funding->total_funds;
 
@@ -2167,10 +2165,9 @@ void update_channel_from_inflight(struct lightningd *ld,
 							channel->opener,
 							&inflight->lease_blockheight_start);
 
-	/* Make a 'clone' of this tx */
-	psbt_copy = clone_psbt(channel, inflight->last_tx->psbt);
 	channel_set_last_tx(channel,
-			    bitcoin_tx_with_psbt(channel, psbt_copy),
+			    bitcoin_tx_with_psbt(channel,
+			    			 inflight->last_tx->psbt),
 			    &inflight->last_sig);
 
 	/* If the remote side rotated their pubkey during splice, update now */