diff --git a/server/channelserver/handlers_house.go b/server/channelserver/handlers_house.go
index 52cdb4fa9..4cc53d303 100644
--- a/server/channelserver/handlers_house.go
+++ b/server/channelserver/handlers_house.go
@@ -250,7 +250,7 @@ func handleMsgMhfLoadDecoMyset(s *Session, p mhfpacket.MHFPacket) {
 		s.logger.Error("Failed to load decomyset", zap.Error(err))
 	}
 	if len(data) == 0 {
-		if s.server.erupeConfig.RealClientMode <= _config.G7 {
+		if s.server.erupeConfig.RealClientMode < _config.G10 {
 			data = []byte{0x00, 0x00}
 		}
 		data = []byte{0x01, 0x00}
diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go
index a549086a8..d9ec2bc08 100644
--- a/server/channelserver/handlers_quest.go
+++ b/server/channelserver/handlers_quest.go
@@ -633,24 +633,28 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) {
 	offset := uint16(time.Now().Unix())
 	bf.WriteUint16(offset)
 
+	tuneLimit := 770
 	if _config.ErupeConfig.RealClientMode <= _config.F5 {
-		tuneValues = tuneValues[:256]
+		tuneLimit = 256
 	} else if _config.ErupeConfig.RealClientMode <= _config.G3 {
-		tuneValues = tuneValues[:283]
+		tuneLimit = 283
 	} else if _config.ErupeConfig.RealClientMode <= _config.GG {
-		tuneValues = tuneValues[:315]
+		tuneLimit = 315
 	} else if _config.ErupeConfig.RealClientMode <= _config.G61 {
-		tuneValues = tuneValues[:332]
+		tuneLimit = 332
 	} else if _config.ErupeConfig.RealClientMode <= _config.G7 {
-		tuneValues = tuneValues[:339]
+		tuneLimit = 339
 	} else if _config.ErupeConfig.RealClientMode <= _config.G81 {
-		tuneValues = tuneValues[:396]
+		tuneLimit = 396
 	} else if _config.ErupeConfig.RealClientMode <= _config.G91 {
-		tuneValues = tuneValues[:694]
+		tuneLimit = 694
 	} else if _config.ErupeConfig.RealClientMode <= _config.G101 {
-		tuneValues = tuneValues[:704]
+		tuneLimit = 704
 	} else if _config.ErupeConfig.RealClientMode <= _config.Z2 {
-		tuneValues = tuneValues[:750]
+		tuneLimit = 750
+	}
+	if len(tuneValues) > tuneLimit {
+		tuneValues = tuneValues[:tuneLimit]
 	}
 
 	bf.WriteUint16(uint16(len(tuneValues)))