diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c
index 2891365b8..c88075fea 100644
--- a/lightningd/peer_control.c
+++ b/lightningd/peer_control.c
@@ -184,7 +184,13 @@ static void sign_last_tx(struct channel *channel)
 	u8 *msg, **witness;
 
 	assert(!channel->last_tx->wtx->inputs[0].witness);
-
+	/* Attach input amount, to complete transaction for marshaling */
+	if (!channel->last_tx->input_amounts[0]) {
+		channel->last_tx->input_amounts[0]
+			= tal_dup(channel->last_tx->input_amounts,
+				  struct amount_sat,
+				  &channel->funding);
+	}
 	msg = towire_hsm_sign_commitment_tx(tmpctx,
 					    &channel->peer->id,
 					    channel->dbid,