diff --git a/network/mhfpacket/msg_mhf_stampcard_stamp.go b/network/mhfpacket/msg_mhf_stampcard_stamp.go
index a783b3e91..281134c9d 100644
--- a/network/mhfpacket/msg_mhf_stampcard_stamp.go
+++ b/network/mhfpacket/msg_mhf_stampcard_stamp.go
@@ -37,13 +37,16 @@ func (m *MsgMhfStampcardStamp) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Cli
 	}
 	m.Stamps = bf.ReadUint16()
 	bf.ReadUint16() // Zeroed
-	if _config.ErupeConfig.RealClientMode > _config.Z1 {
+	if _config.ErupeConfig.RealClientMode >= _config.Z2 {
 		m.Reward1 = uint16(bf.ReadUint32())
 		m.Reward2 = uint16(bf.ReadUint32())
 		m.Item1 = uint16(bf.ReadUint32())
 		m.Item2 = uint16(bf.ReadUint32())
 		m.Quantity1 = uint16(bf.ReadUint32())
 		m.Quantity2 = uint16(bf.ReadUint32())
+	} else {
+		m.Reward1 = 10
+		m.Reward2 = 10
 	}
 	return nil
 }
diff --git a/server/channelserver/handlers.go b/server/channelserver/handlers.go
index 814518576..4f8e89e7c 100644
--- a/server/channelserver/handlers.go
+++ b/server/channelserver/handlers.go
@@ -1078,30 +1078,31 @@ func handleMsgMhfStampcardStamp(s *Session, p mhfpacket.MHFPacket) {
 
 	bf := byteframe.NewByteFrame()
 	bf.WriteUint16(pkt.HR)
-	var stamps uint16
-	_ = s.server.db.QueryRow(`SELECT stampcard FROM characters WHERE id = $1`, s.charID).Scan(&stamps)
 	if _config.ErupeConfig.RealClientMode >= _config.G1 {
 		bf.WriteUint16(pkt.GR)
 	}
+	var stamps, rewardTier, rewardUnk uint16
+	reward := mhfitem.MHFItemStack{Item: mhfitem.MHFItem{}}
+	s.server.db.QueryRow(`UPDATE characters SET stampcard = stampcard + $1 WHERE id = $2 RETURNING stampcard`, pkt.Stamps, s.charID).Scan(&stamps)
+	bf.WriteUint16(stamps - pkt.Stamps)
 	bf.WriteUint16(stamps)
-	stamps += pkt.Stamps
-	bf.WriteUint16(stamps)
-	s.server.db.Exec(`UPDATE characters SET stampcard = $1 WHERE id = $2`, stamps, s.charID)
-	if stamps%30 == 0 {
-		bf.WriteUint16(2)
-		bf.WriteUint16(pkt.Reward2)
-		bf.WriteUint16(pkt.Item2)
-		bf.WriteUint16(pkt.Quantity2)
-		addWarehouseItem(s, mhfitem.MHFItemStack{Item: mhfitem.MHFItem{ItemID: pkt.Item2}, Quantity: pkt.Quantity2})
-	} else if stamps%15 == 0 {
-		bf.WriteUint16(1)
-		bf.WriteUint16(pkt.Reward1)
-		bf.WriteUint16(pkt.Item1)
-		bf.WriteUint16(pkt.Quantity1)
-		addWarehouseItem(s, mhfitem.MHFItemStack{Item: mhfitem.MHFItem{ItemID: pkt.Item1}, Quantity: pkt.Quantity1})
-	} else {
-		bf.WriteBytes(make([]byte, 8))
+
+	if stamps/30 > (stamps-pkt.Stamps)/30 {
+		rewardTier = 2
+		rewardUnk = pkt.Reward2
+		reward = mhfitem.MHFItemStack{Item: mhfitem.MHFItem{ItemID: pkt.Item2}, Quantity: pkt.Quantity2}
+		addWarehouseItem(s, reward)
+	} else if stamps/15 > (stamps-pkt.Stamps)/15 {
+		rewardTier = 1
+		rewardUnk = pkt.Reward1
+		reward = mhfitem.MHFItemStack{Item: mhfitem.MHFItem{ItemID: pkt.Item1}, Quantity: pkt.Quantity1}
+		addWarehouseItem(s, reward)
 	}
+
+	bf.WriteUint16(rewardTier)
+	bf.WriteUint16(rewardUnk)
+	bf.WriteUint16(reward.Item.ItemID)
+	bf.WriteUint16(reward.Quantity)
 	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 }