Mad Men star Hamm generated headlines in March when he cited Kardashian's fame as proof that "stupidity is certainly celebrated" in our society.
Kardashian responded by branding Hamm's comments as "careless", but Hamm stood by the remarks because he believed they were "accurate".
Hamm and Kardashian both made cameo appearances on 30 Rock's live episode on Thursday (April 26) and they apparently took time to speak before the broadcast.
A friend of Kardashian told TMZ that she found Hamm "very sweet and very respectful" and added that they "laughed [the controversy] off".
Kardashian and Hamm were just two of many celebrities to guest star on 30 Rock last night.
Will Forte, Sir Paul McCartney, Brian Williams, Amy Poehler, Jimmy Fallon and Donald Glover also made surprise appearances on the NBC sitcom.
Watch a clip of Kim Kardashian and Jon Hamm on 30 Rock below: