Yahoo TV
Please enable Javascript

Javascript needs to be enabled in your browser to use Yahoo TV.

Here’s how to turn it on:

Kim Kardashian & Jon Hamm Make Peace On '30 Rock's' Live Episode

Kim Kardashian / Jon Hamm -- Getty ImagesKim Kardashian / Jon Hamm -- Getty Images

Did Kim Kardashian and Jon Hamm put a cease fire to their recent war of words with the help of Tina Fey?

The "Mad Men" star and the reality star both appeared on "30 Rock's" live episode on Thursday night, where they reportedly made up.

PLAY IT NOW: Kourtney Kardashin & Kim Kardashian ‘Excited’ For Scott Disick’s ‘RYU’

In March, Jon slammed Kim and Paris Hilton saying, "Being a [expletive] idiot is a valuable commodity in this culture."

Kim later responded to his comments, saying they were "careless."

VIEW THE PHOTOS: The Many Men Of Kim Kardashian

According to TMZ, after the show Kim and Jon "laughed it all off," a friend of the reality star told TMZ.

Adding that Kim said Jon was "very sweet and very respectful."

After her appearance Kim Tweeted, "Anyone see 30 Rock tonight??? I had a blast!!!! Love this show!"

VIEW THE PHOTOS: It’s Hamm-er Time! Hot Shots Of ‘Mad Men’ Star Jon Hamm

AH Nation Poll: "Which '30 Rock' live cameo was your favorite?" VOTE HERE!

Copyright 2012 by NBC Universal, Inc. All rights reserved. This material may not be published, broadcast, rewritten or redistributed.

VIEW THE PHOTOS: Kim Kardashian & Kris Humphries In Happier Times