According to TMZ, Kim Kardashian and Jon Hamm, who had been trading insults via the press last month made amends after the show ended.

We laughed it all off. Kim told a friend, adding that Jon was very sweet and very respectful.

Thursday night's episode of 30 Rock was broadcast live on TV, marking the second time the show has recorded live. The episode, titled Live From Studion 6H featured a slew of guest stars including actor Jon Hamm, reality TV star Kim Kardashian, comedians Donald Glover, Amy Poehler, Fred Armisen, Jimmy Fallen, and even Sir Paul McCartney. Watch it here.

The plot of the episode ironically involved Jack (Alec Baldwin)'s boss breaks the news that The Girly Show (30's Rock's version of SNL) will no longer be broadcast live. Jack and Liz (Tina Fey) embrace the news, thinking it will cut back on costs and make their lives easier, only Kenneth Parcel takes a stand against the change.

So Kenneth locks most of the cast in their dressing room and swallows the key, refusing to let them leave until they see the light that is live sketch comedy. In the dressing room the characters get nostalgic about their favorite live TV moments (the moon landing, The Beatles performance and The Voice results show). A number of flashbacks pad out the episode and offer plenty of opportunities for guest star cameos.

Only Jenna was able to avoid getting locked up by Kenneth, and is attempting to get her cross-driving fiancé to her on TGS live before the shows starts pre-recording its episodes. The engagement ring is actually Liza Minnelli's baby tooth surrounded by rubies that passed through Michael Kors, and understandably took some time to be prepared.