diff --git a/server/channelserver/handlers_house.go b/server/channelserver/handlers_house.go
index 1cb47ec3e..62561c96d 100644
--- a/server/channelserver/handlers_house.go
+++ b/server/channelserver/handlers_house.go
@@ -281,6 +281,11 @@ func handleMsgMhfSaveDecoMyset(s *Session, p mhfpacket.MHFPacket) {
 		bf.WriteUint8(0)
 	}
 
+	// Handle nil data
+	if len(temp) == 0 {
+		temp = append(bf.Data(), uint8(0))
+	}
+
 	// Build a map of set data
 	sets := make(map[uint16][]byte)
 	oldSets := byteframe.NewByteFrameFromBytes(temp[2:])