diff --git a/code/modules/mob/living/carbon/death.dm b/code/modules/mob/living/carbon/death.dm
index 1d60c2d46d5b1..85a6b06a2d340 100644
--- a/code/modules/mob/living/carbon/death.dm
+++ b/code/modules/mob/living/carbon/death.dm
@@ -5,7 +5,7 @@
 	losebreath = 0
 
 	if(!gibbed)
-	//	INVOKE_ASYNC(src, PROC_REF(emote), "deathgasp") // Bubber FIX: deathgasps
+		INVOKE_ASYNC(src, PROC_REF(emote), "deathgasp")
 		add_memory_in_range(src, 7, /datum/memory/witnessed_death, protagonist = src)
 	reagents.end_metabolization(src)
 
diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
index 31d574bc9b5f9..c4ad9aab6562e 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -102,7 +102,7 @@
 	if(stat == DEAD)
 		return FALSE
 
-	if(!gibbed) // Bubber FIX: deathgasps
+	if(!gibbed && (death_sound || death_message))
 		INVOKE_ASYNC(src, TYPE_PROC_REF(/mob, emote), "deathgasp")
 
 	set_stat(DEAD)