diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java b/src/main/java/com/l2jserver/datapack/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
index 29b6553e0afa1cc03990781a5644b9f023d65922..bbb516ac16ac06df5ef328c7a4c3c53b2897e7dc 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
@@ -120,10 +120,12 @@ public final class Q00628_HuntGoldenRam extends Quest {
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) {
 		final QuestState qs = getRandomPartyMemberState(killer, -1, 1, npc);
-		if (qs != null) {
-			switch (qs.getCond()) {
-				case 1 -> giveItemRandomly(qs.getPlayer(), npc, SPLINTER_DROPLIST.get(npc), true);
-				case 2 -> giveItemRandomly(qs.getPlayer(), npc, NEEDLE_DROPLIST.get(npc), true);
+		if (qs != null && !qs.isCond(3)) {
+			if (qs.getCond() >= 1) {
+				giveItemRandomly(qs.getPlayer(), npc, SPLINTER_DROPLIST.get(npc), true);
+				if (qs.isCond(2)) {
+					giveItemRandomly(qs.getPlayer(), npc, NEEDLE_DROPLIST.get(npc), true);
+				}
 			}
 		}
 		return super.onKill(npc, killer, isSummon);