diff --git a/consensus/types/state.go b/consensus/types/state.go
index 0e6b15778..2276d00cc 100644
--- a/consensus/types/state.go
+++ b/consensus/types/state.go
@@ -77,10 +77,20 @@ type RoundState struct {
 // RoundStateEvent returns the H/R/S of the RoundState as an event.
 func (rs *RoundState) RoundStateEvent() types.EventDataRoundState {
 	edrs := types.EventDataRoundState{
-		Height:     rs.Height,
-		Round:      rs.Round,
-		Step:       rs.Step.String(),
-		RoundState: rs,
+		Height: rs.Height,
+		Round:  rs.Round,
+		Step:   rs.Step.String(),
+		// send only fields needed by makeRoundStepMessages
+		RoundState: &RoundState{
+			Height:             rs.Height,
+			Round:              rs.Round,
+			Step:               rs.Step,
+			StartTime:          rs.StartTime,
+			LastCommit:         rs.LastCommit,
+			LockedBlock:        rs.LockedBlock,   // consensus/state_test.go#L398
+			ProposalBlock:      rs.ProposalBlock, // consensus/state_test.go#L253
+			ProposalBlockParts: rs.ProposalBlockParts,
+		},
 	}
 	return edrs
 }