diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 91a6613..4e4f530 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,5 +1,6 @@
 # This is the official list of Chihaya contributors, in alphabetical order.
 
 Jimmy Zelinskie <jimmyzelinskie@gmail.com>
+Josh de Kock <josh@itanimul.li>
 Justin Li <jli@j-li.net>
 Leo Balduf <balduf@hm.edu>
diff --git a/server/http/request.go b/server/http/request.go
index d824435..a8ae9d5 100644
--- a/server/http/request.go
+++ b/server/http/request.go
@@ -23,7 +23,9 @@ func announceRequest(r *http.Request, cfg *httpConfig) (*chihaya.AnnounceRequest
 	request := &chihaya.AnnounceRequest{Params: q}
 
 	eventStr, err := q.String("event")
-	if err != nil {
+	if err == query.ErrKeyNotFound {
+		eventStr = ""
+	} else if err != nil {
 		return nil, tracker.ClientError("failed to parse parameter: event")
 	}
 	request.Event, err = event.New(eventStr)