diff --git a/src/k_collide.c b/src/k_collide.c
index e18d8e05a..ab0c8a9fb 100644
--- a/src/k_collide.c
+++ b/src/k_collide.c
@@ -591,7 +591,7 @@ boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2)
 		// Player Damage
 		if (K_KartBouncing(t2, t1->target, false, true))
 		{
-			P_DamageMobj(t2, t1->target, t1, 1, DMG_NORMAL);
+			P_DamageMobj(t2, t1, t1->target, 1, DMG_NORMAL);
 			K_BubbleShieldCollideDrain(t1->target->player, t1);
 			S_StartSound(t2, sfx_s3k44);
 		}
diff --git a/src/p_inter.c b/src/p_inter.c
index bfb5f7143..1d14b249a 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -2260,13 +2260,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 					}
 				}
 
-				// Fix for bubble shield hit having no hit em!!!!!!
-				{
-					mobj_t *attacker = source->player ? source : NULL;
-					if (!attacker && source->target && source->target->player)
-						attacker = source->target;
-					K_TryHurtSoundExchange(target, attacker);
-				}
+				K_TryHurtSoundExchange(target, source);
 			}
 			else
 			{