If they actually cheer you up the problem may not be just your friend's joke repertoire...
I'm not criticizing you though, I have a dark sense of humor so something like that might make me laugh, even though I knew it shouldn't and I'd feel bad about it afterward, so I understand.