diff --git a/mods/ENTITIES/mcl_mobs/api.lua b/mods/ENTITIES/mcl_mobs/api.lua
index bb558cd86f..f74dc44546 100644
--- a/mods/ENTITIES/mcl_mobs/api.lua
+++ b/mods/ENTITIES/mcl_mobs/api.lua
@@ -801,7 +801,7 @@ local check_for_death = function(self, cause, cmi_cause)
 	if self.on_die then
 
 		local pos = self.object:get_pos()
-		local on_die_exit = self.on_die(self, pos)
+		local on_die_exit = self.on_die(self, pos, cmi_cause)
 		if on_die_exit ~= true then
 			death_handle(self)
 		end
diff --git a/mods/ENTITIES/mobs_mc/creeper.lua b/mods/ENTITIES/mobs_mc/creeper.lua
index 325d78b151..2beffcf836 100644
--- a/mods/ENTITIES/mobs_mc/creeper.lua
+++ b/mods/ENTITIES/mobs_mc/creeper.lua
@@ -37,7 +37,7 @@ mobs:register_mob("mobs_mc:creeper", {
 	run_velocity = 2.1,
 	runaway_from = { "mobs_mc:ocelot", "mobs_mc:cat" },
 	attack_type = "explode",
-	
+
 	explosion_strength = 3,
 	reach = 4,
 	explosion_timer = 1.5,
@@ -76,12 +76,16 @@ mobs:register_mob("mobs_mc:creeper", {
 			end
 		end
 	end,
-	on_die = function(self, pos)
-		-- Drop a random music disc
-		-- TODO: Only do this if killed by skeleton or stray
-		if math.random(1, 200) == 1 then
-			local r = math.random(1, #mobs_mc.items.music_discs)
-			minetest.add_item({x=pos.x, y=pos.y+1, z=pos.z}, mobs_mc.items.music_discs[r])
+	on_die = function(self, pos, cmi_cause)
+		-- Drop a random music disc when killed by skeleton or stray
+		if cmi_cause and cmi_cause.type == "punch" then
+			local luaentity = cmi_cause.puncher and cmi_cause.puncher:get_luaentity()
+			if luaentity and luaentity.name:find("arrow") then
+				local shooter_luaentity = luaentity._shooter and luaentity._shooter:get_luaentity()
+				if shooter_luaentity and (shooter_luaentity.name == "mobs_mc:skeleton" or shooter_luaentity.name == "mobs_mc:stray") then
+					minetest.add_item({x=pos.x, y=pos.y+1, z=pos.z}, mobs_mc.items.music_discs[math.random(1, #mobs_mc.items.music_discs)])
+				end
+			end
 		end
 	end,
 	maxdrops = 2,