diff --git a/schemas/patch-schema/event-ancientdragon.sql b/schemas/patch-schema/event-ancientdragon.sql
new file mode 100644
index 000000000..75b2e5564
--- /dev/null
+++ b/schemas/patch-schema/event-ancientdragon.sql
@@ -0,0 +1,5 @@
+BEGIN;
+
+ALTER TYPE event_type ADD VALUE 'ancientdragon';
+
+END;
\ No newline at end of file
diff --git a/server/channelserver/handlers_event.go b/server/channelserver/handlers_event.go
index 70f358f1b..be0ff74ed 100644
--- a/server/channelserver/handlers_event.go
+++ b/server/channelserver/handlers_event.go
@@ -45,9 +45,12 @@ func handleMsgMhfEnumerateEvent(s *Session, p mhfpacket.MHFPacket) {
 	id, start := uint32(0xCAFEBEEF), uint32(0)
 
 	rows, _ := s.server.db.Queryx("SELECT id, (EXTRACT(epoch FROM start_time)::int) as start_time FROM events WHERE event_type='ancientdragon'")
-	for rows.Next() {
-		rows.Scan(&id, &start)
+	if !rows.Next() {
+		for rows.Next() {
+			rows.Scan(&id, &start)
+		}
 	}
+
 	var timestamps []uint32
 	events := []Event{}