diff --git a/src/p_mobj.c b/src/p_mobj.c
index 8f350cbe7..ca77a8f14 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -3301,16 +3301,13 @@ void P_MobjCheckWater(mobj_t *mobj)
 		mobj->waterskip = 0;
 	}
 
-	if (mobj->waterskip == 0 && wasinwater)
+	if (p != NULL
+		&& p->curshield != KSHIELD_BUBBLE
+		&& mobj->waterskip == 0
+		&& wasinwater)
 	{
-		if (p && p->curshield == KSHIELD_BUBBLE)
-		{
-			;
-		}
-		else
-		{
-			S_StartSound(mobj, sfx_s3k38);
-		}
+		// Play the gasp sound
+		S_StartSound(mobj, sfx_s3k38);
 	}
 
 	if (mobj->flags & MF_APPLYTERRAIN)