Diffuse vs. defuse

Going through my beta-reader’s notes, I noticed her question about how I wrote about the hero needing to dial-down a tense situation. In that case, do you “defuse” the situation or “diffuse” the situation?

Perennial life-saver Mignon Foggarty, aka The Grammar Girl, saves the day with her tips on diffuse vs. defuse.