diff --git a/src/map/clif.c b/src/map/clif.c
index 0f21ec328f0..12d66ae4cba 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8023,7 +8023,7 @@ static void clif_autospell(struct map_session_data *sd, uint16 skill_lv, int *sk
 #if PACKETVER_MAIN_NUM >= 20090406 || defined(PACKETVER_RE) || defined(PACKETVER_ZERO) || PACKETVER_SAK_NUM >= 20080618
 	nullpo_retv(sd);
 
-#if PACKETVER_MAIN_NUM >= 20181128 || PACKETVER_RE_NUM >= 20181031
+#if PACKETVER_MAIN_NUM >= 20181128 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20180523
 	const int len = sizeof(struct PACKET_ZC_AUTOSPELLLIST) + sizeof(int) * list_len;
 #else
 	const int len = sizeof(struct PACKET_ZC_AUTOSPELLLIST);
@@ -8040,7 +8040,7 @@ static void clif_autospell(struct map_session_data *sd, uint16 skill_lv, int *sk
 	memset(p, 0, sizeof(struct PACKET_ZC_AUTOSPELLLIST));
 
 	p->packetType = HEADER_ZC_AUTOSPELLLIST;
-#if PACKETVER_MAIN_NUM >= 20181128 || PACKETVER_RE_NUM >= 20181031
+#if PACKETVER_MAIN_NUM >= 20181128 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20180523
 	p->packetLength = len;
 #endif
 	memcpy(p->skills, skill_ids_list, sizeof(int) * list_len);
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 3cf54b8b3b5..e12f1a86f07 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -3708,7 +3708,7 @@ struct PACKET_CZ_VIEW_CAMERAINFO {
 DEFINE_PACKET_HEADER(CZ_VIEW_CAMERAINFO, 0x0a77);
 #endif
 
-#if PACKETVER_MAIN_NUM >= 20181128 || PACKETVER_RE_NUM >= 20181031
+#if PACKETVER_MAIN_NUM >= 20181128 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20180523
 // PACKET_ZC_AUTOSPELLLIST2
 struct PACKET_ZC_AUTOSPELLLIST {
 	int16 packetType;
@@ -4768,7 +4768,7 @@ struct PACKET_ZC_NOTIFY_SKILL {
 	int8 action;
 } __attribute__((packed));
 DEFINE_PACKET_HEADER(ZC_NOTIFY_SKILL, 0x01de);
-#endif 
+#endif
 
 #if PACKETVER_MAIN_NUM >= 20130731 || PACKETVER_RE_NUM >= 20130724 || defined(PACKETVER_ZERO)
 struct PACKET_ZC_USE_SKILL {
diff --git a/src/map/skill.c b/src/map/skill.c
index b836e26dc2c..7c3ec10f245 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -25079,7 +25079,7 @@ static bool skill_read_autospell_db(const char *filename)
 		count++;
 	}
 
-#if PACKETVER_MAIN_NUM < 20181128 && PACKETVER_RE_NUM < 20181031
+#if PACKETVER_MAIN_NUM < 20181128 && PACKETVER_RE_NUM < 20181031 && PACKETVER_ZERO_NUM < 20180523
 	if (count > 7) {
 		ShowWarning("%s: Your current packet version only supports up to 7 autospell skills, but your autospell db contains \"%d\" skills. Some skills may not be shown.\n", __func__, count);
 		ShowWarning("%s:    Update your packet version or reduce the number of skills to fix this warning.\n", __func__);