diff --git a/lnwire/lnwire.go b/lnwire/lnwire.go
index 486dffdf8..2b114b4de 100644
--- a/lnwire/lnwire.go
+++ b/lnwire/lnwire.go
@@ -191,6 +191,12 @@ func writeElement(w io.Writer, element interface{}) error {
 			return err
 		}
 
+		if e.Index > math.MaxUint16 {
+			return fmt.Errorf("index for outpoint (%v) is "+
+				"greater than max index of %v", e.Index,
+				math.MaxUint16)
+		}
+
 		var idx [2]byte
 		binary.BigEndian.PutUint16(idx[:], uint16(e.Index))
 		if _, err := w.Write(idx[:]); err != nil {