diff --git a/onchaind/onchaind.c b/onchaind/onchaind.c
index d72724a21..8c9e971d7 100644
--- a/onchaind/onchaind.c
+++ b/onchaind/onchaind.c
@@ -1161,7 +1161,10 @@ static void proposal_should_rbf(struct tracked_output *out)
 
 static void proposal_meets_depth(struct tracked_output *out)
 {
-	bool is_rbf = false;
+	assert(out->proposal);
+
+	/* Our own penalty transactions are going to be RBFed.  */
+	bool is_rbf = proposal_is_rbfable(out->proposal);
 
 	/* If we simply wanted to ignore it after some depth */
 	if (!out->proposal->tx) {
@@ -1180,10 +1183,6 @@ static void proposal_meets_depth(struct tracked_output *out)
 		     tx_type_name(out->tx_type),
 		     output_type_name(out->output_type));
 
-	if (out->proposal)
-		/* Our own penalty transactions are going to be RBFed.  */
-		is_rbf = proposal_is_rbfable(out->proposal);
-
 	wire_sync_write(
 	    REQ_FD,
 	    take(towire_onchaind_broadcast_tx(