diff --git a/lnwallet/channel.go b/lnwallet/channel.go
index 104dd5e0..535a6207 100644
--- a/lnwallet/channel.go
+++ b/lnwallet/channel.go
@@ -300,7 +300,7 @@ func (s *commitmentChain) tail() *commitment {
 //  * .SignNextCommitment()
 //    * Called one one wishes to sign the next commitment, either initiating a
 //      new state update, or responding to a received commitment.
-/// * .ReceiveNewCommitment()
+//  * .ReceiveNewCommitment()
 //    * Called upon receipt of a new commitment from the remote party. If the
 //      new commitment is valid, then a revocation should immediately be
 //      generated and sent.
@@ -497,6 +497,9 @@ func NewLightningChannel(signer Signer, bio BlockChainIO,
 			return
 		}
 
+		// TODO(roasbeef): only close channel if we detect that it's
+		// not our transaction?
+
 		// If the channel's doesn't already indicate that a commitment
 		// transaction has been broadcast on-chain, then this means the
 		// remote party broadcasted their commitment transaction.
@@ -675,6 +678,15 @@ func (lc *LightningChannel) fetchCommitmentView(remoteChain bool,
 		}
 	}
 
+	// Set the state hint of the commitment transaction to facilitate
+	// quickly recovering the necessary penalty state in the case of an
+	// uncooperative broadcast.
+	obsfucator := lc.channelState.StateHintObsfucator
+	stateNum := uint32(nextHeight)
+	if err := SetStateNumHint(commitTx, stateNum, obsfucator); err != nil {
+		return nil, err
+	}
+
 	// Sort the transactions according to the agreed upon cannonical
 	// ordering. This lets us skip sending the entire transaction over,
 	// instead we'll just send signatures.
diff --git a/lnwallet/channel_test.go b/lnwallet/channel_test.go
index a458c780..5bd96b79 100644
--- a/lnwallet/channel_test.go
+++ b/lnwallet/channel_test.go
@@ -167,7 +167,7 @@ func forceStateTransition(chanA, chanB *LightningChannel) error {
 }
 
 // createTestChannels creates two test channels funded with 10 BTC, with 5 BTC
-// allocated to each side.
+// allocated to each side. Within the channel, Alice is the initiator.
 func createTestChannels(revocationWindow int) (*LightningChannel, *LightningChannel, func(), error) {
 	aliceKeyPriv, aliceKeyPub := btcec.PrivKeyFromBytes(btcec.S256(),
 		testWalletPrivKey)
@@ -228,9 +228,15 @@ func createTestChannels(revocationWindow int) (*LightningChannel, *LightningChan
 		return nil, nil, nil, err
 	}
 
+	var obsfucator [StateHintSize]byte
+	copy(obsfucator[:], aliceFirstRevoke[:])
+
 	aliceChannelState := &channeldb.OpenChannel{
 		IdentityPub:            aliceKeyPub,
 		ChanID:                 prevOut,
+		ChanType:               channeldb.SingleFunder,
+		IsInitiator:            true,
+		StateHintObsfucator:    obsfucator,
 		OurCommitKey:           aliceKeyPub,
 		TheirCommitKey:         bobKeyPub,
 		Capacity:               channelCapacity,
@@ -251,6 +257,9 @@ func createTestChannels(revocationWindow int) (*LightningChannel, *LightningChan
 	bobChannelState := &channeldb.OpenChannel{
 		IdentityPub:            bobKeyPub,
 		ChanID:                 prevOut,
+		ChanType:               channeldb.SingleFunder,
+		IsInitiator:            false,
+		StateHintObsfucator:    obsfucator,
 		OurCommitKey:           bobKeyPub,
 		TheirCommitKey:         aliceKeyPub,
 		Capacity:               channelCapacity,