diff --git a/server/handlers.go b/server/handlers.go
index a31e29c..eeacaa7 100644
--- a/server/handlers.go
+++ b/server/handlers.go
@@ -533,6 +533,10 @@ func (s *Server) putHandler(w http.ResponseWriter, r *http.Request) {
 		s.logger.Printf("%s", err.Error())
 		http.Error(w, errors.New("Could not encode metadata").Error(), 500)
 		return
+	} else if time.Now().After(metadata.MaxDate) {
+		s.logger.Print("Invalid MaxDate")
+		http.Error(w, errors.New("Invalid MaxDate, make sure Max-Days is smaller than 290 years").Error(), 400)
+		return
 	} else if err := s.storage.Put(token, fmt.Sprintf("%s.metadata", filename), buffer, "text/json", uint64(buffer.Len())); err != nil {
 		s.logger.Printf("%s", err.Error())
 		http.Error(w, errors.New("Could not save metadata").Error(), 500)