diff --git a/generic-handlers.go b/generic-handlers.go
index a596078de..822160c76 100644
--- a/generic-handlers.go
+++ b/generic-handlers.go
@@ -120,7 +120,12 @@ func (h timeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 // CorsHandler handler for CORS (Cross Origin Resource Sharing)
 func CorsHandler(h http.Handler) http.Handler {
-	return cors.Default().Handler(h)
+	c := cors.New(cors.Options{
+		AllowedOrigins: []string{"*"},
+		AllowedMethods: []string{"GET", "HEAD", "POST"},
+		AllowedHeaders: []string{"*"},
+	})
+	return c.Handler(h)
 }
 
 // IgnoreResourcesHandler -