On Sunday's episode of I Am Cait, Kris Jenner joined Caitlyn and her friends in New Orleans for a night of awkward conversation and uncomfortable tension.
Caitlyn's ex-wife met her new friends for the first time and got along swimmingly with the diverse group of transgender activists and intellectuals. However, things were still a little touchy between the exes.
Kris first met with Caitlyn at the I Am Cait star's hotel room in the Big Easy, where the night got off to a bit of a rocky start when producers asked Caitlyn and Kris if they were planning to go out and collect beads in the French Quarter by flashing.
Kris laughed the idea off, but suggested Caitlyn could, saying, "Your boobs are a little fresher than mine. You just got a boob job."
WATCH: Kris Jenner Says Caitlyn Never Told Her 'I Want to Be a Woman' in Tense Conversation
Sitting down with Caitlyn's friends, Kris gently roasted her ex, asking the Olympian's tour bus companions to share the most irritating thing about traveling with Caitlyn. It wasn't long before the issue of Caitlyn's conservative politics once again became the focal point of debate.
"You're not a politician, but you think you're a politician sometimes," Kris told Caitlyn. "Sometimes, when you talk to somebody about your views, not everybody's going to always agree. And sometimes, you can get a little cranky [about that]."
Perhaps Kris' best advice for Caitlyn was to simply "shut the f**k up and relax." It was advice that Caitlyn didn't seem to appreciate nearly as much as all of her friends, who were laughing in total agreement.
Later, during a dinner date, Kris went on to argue that Caitlyn never told her she was transgender during their relationship, contrary to what Caitlyn has said several times in the past.
WATCH: Caitlyn Jenner Tears Up While Trying on a Wedding Dress: I Can Finally Be 'Comfortable'
"There was no, 'I am transgender,'" Kris claimed. "She keeps saying she told me, but she didn't."
Recalling a conversation with Caitlyn while she was still living as Bruce Jenner, Kris recounted, "He says to me, 'Do you ever want to have more kids?' I said, 'Ugh, god no!' So he says, 'Neither do I! That's great. I couldn't have any more kids if I wanted to.' I went, 'Wait, what?' He goes, 'Oh, geez. Back in the '80s, I messed around with this or that and it kind of screwed up my sperm count, but whatever.' It could have been steroids, for all I knew, because he was an athlete. He never said estrogen, he never said anything."
After a tense quiet argument over the course of events early in their love life, it became somewhat apparent to the other women at the table that this might be the very first time Kris and Caitlyn had ever had this very important conversation.
WATCH: Caitlyn Jenner Discusses What It Would Take to Improve Her Relationship With Kris Jenner
"The bottom line for Kris and Caitlyn to be able to move forward is forgiveness, and forgiveness is no small thing," shared Caitlyn's friend, Jenny Boylan, who has been on I Am Cait since its Season 1 premiere.
"It's clear to me, even now, they have a relationship that goes very deep," Boylan continued. "It sure feels to me like they are going to be part of each other's lives for the long-term, but they each have work to do if that's going to be true."
However, after butting heads during dinner, Caitlyn, Kris and the ladies hit Bourbon Street to dance and drink. The former couple hit things off, dancing and smiling together at a nightclub.
"They would make a really hot lesbian couple," Caitlyn's friend, Kip Zachary, told Candis Cayne, who couldn't agree more.
WATCH: Caitlyn Jenner Disses Hillary Clinton in 'I Am Cait' Season 2 Premiere
While Kris said she had no interest in flashing her chest to collect beads, she seemed to have no problem hanging out with the group on one of the famed French Quarter balconies and tossing beads down to people in the crowd walking along Bourbon Street.
In a surprisingly sweet moment on the balcony, Kris asked Caitlyn about her admission, made to Kim Kardashian in a previous episode, that she was interested in dating a guy.
"I don't know. Right now I'm just trying to figure myself out," Caitlyn explained, adding that she would only consider dating a man "if I went through with final surgery and all that. I wouldn't date a guy with…"
Kris seemed surprised by Caitlyn's hesitance, but helpfully added, "You can go out for a drink, you don't have to have sex."
"Let me just say, life is very short and you better figure it out fast," Kris added.
WATCH: Kris Jenner Says Caitlyn Jenner's Interest in Dating Men is 'Confusing'
After a long night of partying, drinking, laughing and genuinely hashing out some bad blood, Kris fit right in with Caitlyn's supportive squad, with Kris even telling them, "I can't wait to see you guys again. I mean that."
Finally, to put a the last fitting touch on a strangely reconciliatory evening, Caitlyn reached over and planted a long, playful kiss on her ex's mouth, much to Kris' surprise and the group's loud cheering.
I Am Cait airs Sundays at 9 p.m. ET/PT on E!