Kylie Jenner and Tyga are "back on track".

A source told E! News: "They are back on track for now. Kylie has been hanging out at his new place.

"Tyga was going to stay there until his house was ready. They lived together for about a month. He was thinking about moving out anyway because he likes his own space. But then she started that 'needing her space' stuff and he decided to leave earlier."

Meanwhile, Kylie recently revealed she and Tyga were happy being pals before their relationship took a romantic turn.

She said: "We just honestly ... We became best friends before anything happened so I think that, that's awesome and we're just like ... I don't know. Hanging out. Living life."

And Kylie even hinted recently that marriage could be on the cards.

She showed no signs of trouble in their relationship and was quick to respond when asked if she wants to tie the knot with the rapper.

In a video of Kylie leaving an American Music Awards (AMAs) afterparty at The Nice Guy in West Hollywood, posted on TMZ, the 'Keeping Up With the Kardashians' star was asked if she was going to marry Tyga and simply said "yes".

The pair were also said to have looked as much in love as ever at the bash at the weekend.

A source told People magazine: "Kylie and Tyga were definitely affectionate, kissing and holding hands.

"They were nuzzling at their table and being super engaged with each other."