diff --git a/src/p_enemy.c b/src/p_enemy.c
index c90eb5336..220f8cf16 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -4178,10 +4178,6 @@ void A_BossDeath(mobj_t *mo)
 		case MT_CYBRAKDEMON:
 			P_DoCybrakdemonDeath(mo);
 			break;
-		case MT_KOOPA:
-			if (mo->spawnpoint)
-				EV_DoCeiling(mo->spawnpoint->args[0], NULL, raiseToHighest);
-			break;
 		case MT_FANG:
 			P_DoBoss5Death(mo);
 			break;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index bb9bd22a7..7e8f4b397 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -6939,7 +6939,6 @@ static void P_RemoveOverlay(mobj_t *thing)
 	}
 }
 
-void A_BossDeath(mobj_t *mo);
 // AI for the Koopa boss.
 static void P_KoopaThinker(mobj_t *koopa)
 {
@@ -6947,7 +6946,8 @@ static void P_KoopaThinker(mobj_t *koopa)
 
 	if (koopa->watertop > koopa->z + koopa->height + FixedMul(128*FRACUNIT, koopa->scale) && koopa->health > 0)
 	{
-		A_BossDeath(koopa);
+		if (koopa->spawnpoint)
+			EV_DoCeiling(koopa->spawnpoint->args[0], NULL, raiseToHighest);
 		P_RemoveMobj(koopa);
 		return;
 	}