I have nearly the same experience, but because I moved to a new company/job I had to make my change permanent. My jokes were getting in the way of being product

I have nearly the same experience, but because I moved to a new company/job I had to make my change permanent. My jokes were getting in the way of being productive and so I started to bite by tongue when I think of something funny. Now I save my humor for times where productivity is not an issue, nor is decision making or in the presence of others making decisions or being productive. This is the nice balance I have found. (it's been better for me at work in every way to make this conscious decision on a regular basis, still not easy, but worth it)